Merge pull request swiftlang#34719 from gottesmm/pr-d375facecff3f140fbe637c64f0fb620504df653

[silgen] Make SwitchCaseFullExpr use an ArgumentScope instead of just a Scope.

Author: gottesmm

lib/SILGen/ArgumentScope.h

@@ -61,6 +61,8 @@ class ArgumentScope {
     formalEvalScope.verify();
   }
 
+  bool isValid() const { return normalScope.isValid(); }
+
 private:
   void popImpl() {
     // We must always pop the formal eval scope before the normal scope since

lib/SILGen/SwitchEnumBuilder.cpp

@@ -22,11 +22,11 @@ using namespace Lowering;
 //===----------------------------------------------------------------------===//
 
 SwitchCaseFullExpr::SwitchCaseFullExpr(SILGenFunction &SGF, CleanupLocation loc)
-    : SGF(SGF), scope(SGF.Cleanups, loc), loc(loc), branchDest() {}
+    : SGF(SGF), scope(SGF, loc), loc(loc), branchDest() {}
 
 SwitchCaseFullExpr::SwitchCaseFullExpr(SILGenFunction &SGF, CleanupLocation loc,
                                        SwitchCaseBranchDest branchDest)
-    : SGF(SGF), scope(SGF.Cleanups, loc), loc(loc), branchDest(branchDest) {}
+    : SGF(SGF), scope(SGF, loc), loc(loc), branchDest(branchDest) {}
 
 void SwitchCaseFullExpr::exitAndBranch(SILLocation loc,
                                        ArrayRef<SILValue> branchArgs) {

lib/SILGen/SwitchEnumBuilder.h

@@ -13,6 +13,7 @@
 #ifndef SWIFT_SILGEN_SWITCHENUMBUILDER_H
 #define SWIFT_SILGEN_SWITCHENUMBUILDER_H
 
+#include "ArgumentScope.h"
 #include "Scope.h"
 
 namespace swift {
@@ -52,7 +53,7 @@ struct SwitchCaseBranchDest {
 /// This scope is also exposed to the debug info.
 class SwitchCaseFullExpr {
   SILGenFunction &SGF;
-  Scope scope;
+  ArgumentScope scope;
   CleanupLocation loc;
   SwitchCaseBranchDest branchDest;
 

test/SILGen/Inputs/objc_bridging_nsurl.h

@@ -0,0 +1,8 @@
+
+@import Foundation;
+
+@interface ObjCKlass : NSObject
+
+@property(nonatomic, copy, nullable) NSURL *outputURL;
+
+@end

test/SILGen/objc_bridging_url.swift

@@ -0,0 +1,12 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-swift-emit-silgen -import-objc-header %S/Inputs/objc_bridging_nsurl.h %s
+
+// REQUIRES: objc_interop
+
+// Make sure we do not crash on this
+
+protocol P {
+  var outputURL : URL? { get set }
+}
+
+extension ObjCKlass : P {}