Merge pull request #63529 from meg-gupta/fixptrauthcirdar

swift-ci · web-flow · commit d9d8d56d9490 · 2023-02-08T17:40:01.000-08:00
Fix bug during IR generation of a signed access
diff --git a/lib/IRGen/IRGenSIL.cpp b/lib/IRGen/IRGenSIL.cpp
@@ -5930,7 +5930,7 @@ void IRGenSILFunction::visitEndAccessInst(EndAccessInst *i) {
   }
 
   case SILAccessEnforcement::Signed: {
-    if (access->getAccessKind() != SILAccessKind::Modify ||
+    if (access->getAccessKind() != SILAccessKind::Modify &&
         access->getAccessKind() != SILAccessKind::Init) {
       // nothing to do.
       return;
diff --git a/test/IRGen/ptrauth_field_fptr_import.swift b/test/IRGen/ptrauth_field_fptr_import.swift
@@ -1,5 +1,4 @@
-// RUN: %swift-frontend %s -enable-import-ptrauth-field-function-pointers -emit-ir -target arm64e-apple-ios13.0 -I %S/Inputs/ -validate-tbd-against-ir=none 2>&1 | %FileCheck %s
-
+// RUN: %swift-frontend %s -enable-import-ptrauth-field-function-pointers -emit-ir -target arm64e-apple-ios13.0 -I %S/Inputs/ -validate-tbd-against-ir=none | %FileCheck %s
 // REQUIRES: CPU=arm64e
 // REQUIRES: OS=ios
 
diff --git a/test/SILGen/ptrauth_field_fptr_import.swift b/test/SILGen/ptrauth_field_fptr_import.swift
@@ -1,4 +1,4 @@
-// RUN: %swift-frontend %s -enable-import-ptrauth-field-function-pointers -emit-silgen -target arm64e-apple-ios13.0 -I %S/Inputs/ 2>&1 | %FileCheck %s
+// RUN: %swift-frontend %s -enable-import-ptrauth-field-function-pointers -emit-silgen -target arm64e-apple-ios13.0 -I %S/Inputs/ | %FileCheck %s
 
 // REQUIRES: CPU=arm64e
 // REQUIRES: OS=ios

Original file line number	Diff line number	Diff line change
`@@ -5930,7 +5930,7 @@ void IRGenSILFunction::visitEndAccessInst(EndAccessInst *i) {`
`5930`	`5930`	`}`
`5931`	`5931`
`5932`	`5932`	`case SILAccessEnforcement::Signed: {`
`5933`		`- if (access->getAccessKind() != SILAccessKind::Modify \|\|`
	`5933`	`+ if (access->getAccessKind() != SILAccessKind::Modify &&`
`5934`	`5934`	`access->getAccessKind() != SILAccessKind::Init) {`
`5935`	`5935`	`// nothing to do.`
`5936`	`5936`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// RUN: %swift-frontend %s -enable-import-ptrauth-field-function-pointers -emit-silgen -target arm64e-apple-ios13.0 -I %S/Inputs/ 2>&1 \| %FileCheck %s`
	`1`	`+// RUN: %swift-frontend %s -enable-import-ptrauth-field-function-pointers -emit-silgen -target arm64e-apple-ios13.0 -I %S/Inputs/ \| %FileCheck %s`
`2`	`2`
`3`	`3`	`// REQUIRES: CPU=arm64e`
`4`	`4`	`// REQUIRES: OS=ios`