Merge pull request swiftlang#40401 from gottesmm/pr-ae46eb0543b75f6523f9651bda7834965d471b09

gottesmm · web-flow · commit 1e0d5b8196de · 2021-12-03T19:40:41.000-08:00
[silgen] Add the lexical flag on more alloc_stack that are used to represent variables.
diff --git a/include/swift/SIL/SILInstruction.h b/include/swift/SIL/SILInstruction.h
@@ -1976,10 +1976,14 @@ class AllocStackInst final
   /// Whether the alloc_stack instruction corresponds to a source-level VarDecl.
   bool isLexical() const { return lexical; }
 
-  /// If this is a lexical borrow, eliminate the lexical bit. If this borrow
-  /// doesn't have a lexical bit, do not do anything.
+  /// If this is a lexical alloc_stack, eliminate the lexical bit. If this
+  /// alloc_stack doesn't have a lexical bit, do not do anything.
   void removeIsLexical() { lexical = false; }
 
+  /// If this is not a lexical alloc_stack, set the lexical bit. If this
+  /// alloc_stack is already lexical, this does nothing.
+  void setIsLexical() { lexical = true; }
+
   /// Return the debug variable information attached to this instruction.
   Optional<SILDebugVariable> getVarInfo() const {
     Optional<SILType> AuxVarType;
diff --git a/lib/SILGen/SILGenDecl.cpp b/lib/SILGen/SILGenDecl.cpp
@@ -472,7 +472,11 @@ class LetValueInitialization : public Initialization {
     }
 
     if (needsTemporaryBuffer) {
-      address = SGF.emitTemporaryAllocation(vd, lowering.getLoweredType());
+      bool isLexical =
+          SGF.getASTContext().SILOpts.supportsLexicalLifetimes(SGF.getModule());
+      address =
+          SGF.emitTemporaryAllocation(vd, lowering.getLoweredType(),
+                                      false /*hasDynamicLifetime*/, isLexical);
       if (isUninitialized)
         address = SGF.B.createMarkUninitializedVar(vd, address);
       DestroyCleanup = SGF.enterDormantTemporaryCleanup(address, lowering);
diff --git a/lib/SILGen/SILGenExpr.cpp b/lib/SILGen/SILGenExpr.cpp
@@ -1027,7 +1027,8 @@ RValue RValueEmitter::visitLoadExpr(LoadExpr *E, SGFContext C) {
 }
 
 SILValue SILGenFunction::emitTemporaryAllocation(SILLocation loc, SILType ty,
-                                                 bool hasDynamicLifetime) {
+                                                 bool hasDynamicLifetime,
+                                                 bool isLexical) {
   ty = ty.getObjectType();
   Optional<SILDebugVariable> DbgVar;
   if (auto *VD = loc.getAsASTNode<VarDecl>())
@@ -1042,7 +1043,8 @@ SILValue SILGenFunction::emitTemporaryAllocation(SILLocation loc, SILType ty,
         DbgVar = SILDebugVariable(VD->isLet(), 0);
         loc = SILLocation(VD);
       }
-  auto alloc = B.createAllocStack(loc, ty, DbgVar, hasDynamicLifetime);
+  auto *alloc =
+      B.createAllocStack(loc, ty, DbgVar, hasDynamicLifetime, isLexical);
   enterDeallocStackCleanup(alloc);
   return alloc;
 }
diff --git a/lib/SILGen/SILGenFunction.h b/lib/SILGen/SILGenFunction.h
@@ -981,12 +981,16 @@ class LLVM_LIBRARY_VISIBILITY SILGenFunction
   /// emitSelfDecl - Emit a SILArgument for 'self', register it in varlocs, set
   /// up debug info, etc.  This returns the 'self' value.
   SILValue emitSelfDecl(VarDecl *selfDecl);
-  
+
   /// Emits a temporary allocation that will be deallocated automatically at the
   /// end of the current scope. Returns the address of the allocation.
+  ///
+  /// \p isLexical if set to true, this is a temporary that we are using for a
+  /// local let that we need to mark with the lexical flag.
   SILValue emitTemporaryAllocation(SILLocation loc, SILType ty,
-                                   bool hasDynamicLifetime = false);
-  
+                                   bool hasDynamicLifetime = false,
+                                   bool isLexical = false);
+
   /// Prepares a buffer to receive the result of an expression, either using the
   /// 'emit into' initialization buffer if available, or allocating a temporary
   /// allocation if not.
diff --git a/lib/SILGen/SILGenProlog.cpp b/lib/SILGen/SILGenProlog.cpp
@@ -290,10 +290,12 @@ struct ArgumentInitHelper {
       }
       SGF.B.createDebugValue(loc, value, varinfo);
     } else {
-      if (auto AllocStack = dyn_cast<AllocStackInst>(value))
-        AllocStack->setArgNo(ArgNo);
-      else
+      if (auto *allocStack = dyn_cast<AllocStackInst>(value)) {
+        allocStack->setArgNo(ArgNo);
+        allocStack->setIsLexical();
+      } else {
         SGF.B.createDebugValueAddr(loc, value, varinfo);
+      }
     }
     SGF.VarLocs[pd] = SILGenFunction::VarLoc::get(value);
   }
diff --git a/test/AutoDiff/SILOptimizer/activity_analysis.swift b/test/AutoDiff/SILOptimizer/activity_analysis.swift
@@ -844,12 +844,12 @@ func testActiveEnumAddr<T>(_ e: IndirectEnum<T>) -> T {
 // CHECK: [ACTIVE]   %3 = alloc_stack $IndirectEnum<T>
 // CHECK: bb1:
 // CHECK: [ACTIVE]   %6 = unchecked_take_enum_data_addr %3 : $*IndirectEnum<T>, #IndirectEnum.case1!enumelt
-// CHECK: [ACTIVE]   %7 = alloc_stack $T, let, name "y1"
+// CHECK: [ACTIVE]   %7 = alloc_stack [lexical] $T, let, name "y1"
 // CHECK: bb2:
 // CHECK: [ACTIVE] {{.*}} = unchecked_take_enum_data_addr {{.*}} : $*IndirectEnum<T>, #IndirectEnum.case2!enumelt
 // CHECK: [ACTIVE] {{.*}} = tuple_element_addr {{.*}} : $*(Float, T), 0
 // CHECK: [VARIED] {{.*}} = load [trivial] {{.*}} : $*Float
 // CHECK: [ACTIVE] {{.*}} = tuple_element_addr {{.*}} : $*(Float, T), 1
-// CHECK: [ACTIVE] {{.*}} = alloc_stack $T, let, name "y2"
+// CHECK: [ACTIVE] {{.*}} = alloc_stack [lexical] $T, let, name "y2"
 // CHECK: bb3:
 // CHECK: [NONE]   {{.*}} = tuple ()
diff --git a/test/Interop/Cxx/class/type-classification-non-trivial-silgen.swift b/test/Interop/Cxx/class/type-classification-non-trivial-silgen.swift
@@ -5,7 +5,7 @@ import TypeClassification
 // Make sure that "StructWithDestructor" is marked as non-trivial by checking for a
 // "destroy_addr".
 // CHECK-LABEL: sil [ossa] @$s4main24testStructWithDestructoryyF
-// CHECK: [[AS:%.*]] = alloc_stack $StructWithDestructor
+// CHECK: [[AS:%.*]] = alloc_stack [lexical] $StructWithDestructor
 // CHECK: [[FN:%.*]] = function_ref @{{_ZN20StructWithDestructorC1Ev|\?\?0StructWithDestructor@@QEAA@XZ}} : $@convention(c) () -> @out StructWithDestructor
 // CHECK: apply [[FN]]([[AS]]) : $@convention(c) () -> @out StructWithDestructor
 // CHECK: destroy_addr [[AS]]
@@ -20,7 +20,7 @@ public func testStructWithDestructor() {
 // Make sure that "HasMemberWithDestructor" is marked as non-trivial by checking
 // for a "destroy_addr".
 // CHECK-LABEL: sil [ossa] @$s4main33testStructWithSubobjectDestructoryyF : $@convention(thin) () -> ()
-// CHECK: [[AS:%.*]] = alloc_stack $StructWithSubobjectDestructor
+// CHECK: [[AS:%.*]] = alloc_stack [lexical] $StructWithSubobjectDestructor
 // CHECK: [[FN:%.*]] = function_ref @{{_ZN29StructWithSubobjectDestructorC1Ev|\?\?0StructWithSubobjectDestructor@@QEAA@XZ}} : $@convention(c) () -> @out StructWithSubobjectDestructor
 // CHECK: apply [[FN]]([[AS]]) : $@convention(c) () -> @out StructWithSubobjectDestructor
 // CHECK: destroy_addr [[AS]]
@@ -32,7 +32,7 @@ public func testStructWithSubobjectDestructor() {
 }
 
 // CHECK-LABLE: sil [ossa] @$s4main37testStructWithCopyConstructorAndValueSbyF
-// CHECK: [[AS:%.*]] = alloc_stack $StructWithCopyConstructorAndValue
+// CHECK: [[AS:%.*]] = alloc_stack [lexical] $StructWithCopyConstructorAndValue
 // CHECK: [[FN:%.*]] = function_ref @{{_ZN33StructWithCopyConstructorAndValueC1Ei|\?\?0StructWithCopyConstructorAndValue@@QEAA@H@Z}} : $@convention(c) (Int32) -> @out StructWithCopyConstructorAndValue
 // CHECK: apply [[FN]]([[AS]], %{{.*}}) : $@convention(c) (Int32) -> @out StructWithCopyConstructorAndValue
 // CHECK: [[OBJ_VAL_ADDR:%.*]] = struct_element_addr [[AS]] : $*StructWithCopyConstructorAndValue, #StructWithCopyConstructorAndValue.value
@@ -53,10 +53,10 @@ public func testStructWithCopyConstructorAndValue() -> Bool {
 }
 
 // CHECK-LABEL: sil [ossa] @$s4main46testStructWithSubobjectCopyConstructorAndValueSbyF : $@convention(thin) () -> Bool
-// CHECK: [[MEMBER_0:%.*]] = alloc_stack $StructWithCopyConstructorAndValue
+// CHECK: [[MEMBER_0:%.*]] = alloc_stack [lexical] $StructWithCopyConstructorAndValue
 // CHECK: [[MAKE_MEMBER_FN:%.*]] = function_ref @{{_ZN33StructWithCopyConstructorAndValueC1Ei|\?\?0StructWithCopyConstructorAndValue@@QEAA@H@Z}} : $@convention(c) (Int32) -> @out StructWithCopyConstructorAndValue
 // CHECK: apply [[MAKE_MEMBER_FN]]([[MEMBER_0]], %{{.*}}) : $@convention(c) (Int32) -> @out StructWithCopyConstructorAndValue
-// CHECK: [[AS:%.*]] = alloc_stack $StructWithSubobjectCopyConstructorAndValue
+// CHECK: [[AS:%.*]] = alloc_stack [lexical] $StructWithSubobjectCopyConstructorAndValue
 // CHECK: [[META:%.*]] = metatype $@thin StructWithSubobjectCopyConstructorAndValue.Type
 // CHECK: [[MEMBER_1:%.*]] = alloc_stack $StructWithCopyConstructorAndValue
 // CHECK: copy_addr %0 to [initialization] [[MEMBER_1]] : $*StructWithCopyConstructorAndValue
@@ -87,10 +87,10 @@ public func testStructWithSubobjectCopyConstructorAndValue() -> Bool {
 
 // testStructWithCopyConstructorAndSubobjectCopyConstructorAndValue()
 // CHECK-LABEL: sil [ossa] @$s4main041testStructWithCopyConstructorAndSubobjectefG5ValueSbyF : $@convention(thin) () -> Bool
-// CHECK: [[MEMBER_0:%.*]] = alloc_stack $StructWithCopyConstructorAndValue
+// CHECK: [[MEMBER_0:%.*]] = alloc_stack [lexical] $StructWithCopyConstructorAndValue
 // CHECK: [[CREATE_MEMBER_FN:%.*]] = function_ref @{{_ZN33StructWithCopyConstructorAndValueC1Ei|\?\?0StructWithCopyConstructorAndValue@@QEAA@H@Z}} : $@convention(c) (Int32) -> @out StructWithCopyConstructorAndValue
 // CHECK: apply [[CREATE_MEMBER_FN]]([[MEMBER_0]], %{{.*}}) : $@convention(c) (Int32) -> @out StructWithCopyConstructorAndValue
-// CHECK: [[AS:%.*]] = alloc_stack $StructWithCopyConstructorAndSubobjectCopyConstructorAndValue
+// CHECK: [[AS:%.*]] = alloc_stack [lexical] $StructWithCopyConstructorAndSubobjectCopyConstructorAndValue
 // CHECK: [[MEMBER_1:%.*]] = alloc_stack $StructWithCopyConstructorAndValue
 // CHECK: copy_addr [[MEMBER_0]] to [initialization] [[MEMBER_1]] : $*StructWithCopyConstructorAndValue
 // CHECK: [[FN:%.*]] = function_ref @{{_ZN60StructWithCopyConstructorAndSubobjectCopyConstructorAndValueC1E33StructWithCopyConstructorAndValue|\?\?0StructWithCopyConstructorAndSubobjectCopyConstructorAndValue@@QEAA@UStructWithCopyConstructorAndValue@@@Z}} : $@convention(c) (@in StructWithCopyConstructorAndValue) -> @out StructWithCopyConstructorAndSubobjectCopyConstructorAndValue
diff --git a/test/SILGen/existential_metatypes.swift b/test/SILGen/existential_metatypes.swift
@@ -24,7 +24,7 @@ struct S: P {
 func existentialMetatype(_ x: P) {
   // CHECK: [[TYPE1:%.*]] = existential_metatype $@thick P.Type, [[X]]
   let type1 = type(of: x)
-  // CHECK: [[INSTANCE1:%.*]] = alloc_stack $P
+  // CHECK: [[INSTANCE1:%.*]] = alloc_stack [lexical] $P
   // CHECK: [[OPEN_TYPE1:%.*]] = open_existential_metatype [[TYPE1]]
   // CHECK: [[INIT:%.*]] = witness_method {{.*}} #P.init!allocator
   // CHECK: [[INSTANCE1_VALUE:%.*]] = init_existential_addr [[INSTANCE1]] : $*P
@@ -34,7 +34,7 @@ func existentialMetatype(_ x: P) {
   // CHECK: [[S:%.*]] = metatype $@thick S.Type
   // CHECK: [[TYPE2:%.*]] = init_existential_metatype [[S]] : $@thick S.Type, $@thick P.Type
   let type2: P.Type = S.self
-  // CHECK: [[INSTANCE2:%.*]] = alloc_stack $P
+  // CHECK: [[INSTANCE2:%.*]] = alloc_stack [lexical] $P
   // CHECK: [[OPEN_TYPE2:%.*]] = open_existential_metatype [[TYPE2]]
   // CHECK: [[STATIC_METHOD:%.*]] = witness_method {{.*}} #P.staticMethod
   // CHECK: [[INSTANCE2_VALUE:%.*]] = init_existential_addr [[INSTANCE2]] : $*P
diff --git a/test/SILGen/foreach.swift b/test/SILGen/foreach.swift
@@ -220,7 +220,7 @@ func existentialBreak(_ xx: [P]) {
 // CHECK:   switch_enum_addr [[ELT_STACK]] : $*Optional<P>, case #Optional.some!enumelt: [[SOME_BB:bb[0-9]+]], case #Optional.none!enumelt: [[NONE_BB:bb[0-9]+]]
 //
 // CHECK: [[SOME_BB]]:
-// CHECK:   [[T0:%.*]] = alloc_stack $P, let, name "x"
+// CHECK:   [[T0:%.*]] = alloc_stack [lexical] $P, let, name "x"
 // CHECK:   [[ELT_STACK_TAKE:%.*]] = unchecked_take_enum_data_addr [[ELT_STACK]] : $*Optional<P>, #Optional.some!enumelt
 // CHECK:   copy_addr [take] [[ELT_STACK_TAKE]] to [initialization] [[T0]]
 // CHECK:   cond_br {{%.*}}, [[LOOP_BREAK_END_BLOCK:bb[0-9]+]], [[CONTINUE_CHECK_BLOCK:bb[0-9]+]]
@@ -380,7 +380,7 @@ func genericStructBreak<T>(_ xx: [GenericStruct<T>]) {
 // CHECK:   switch_enum_addr [[ELT_STACK]] : $*Optional<GenericStruct<T>>, case #Optional.some!enumelt: [[SOME_BB:bb[0-9]+]], case #Optional.none!enumelt: [[NONE_BB:bb[0-9]+]]
 //
 // CHECK: [[SOME_BB]]:
-// CHECK:   [[T0:%.*]] = alloc_stack $GenericStruct<T>, let, name "x"
+// CHECK:   [[T0:%.*]] = alloc_stack [lexical] $GenericStruct<T>, let, name "x"
 // CHECK:   [[ELT_STACK_TAKE:%.*]] = unchecked_take_enum_data_addr [[ELT_STACK]] : $*Optional<GenericStruct<T>>, #Optional.some!enumelt
 // CHECK:   copy_addr [take] [[ELT_STACK_TAKE]] to [initialization] [[T0]]
 // CHECK:   cond_br {{%.*}}, [[LOOP_BREAK_END_BLOCK:bb[0-9]+]], [[CONTINUE_CHECK_BLOCK:bb[0-9]+]]
@@ -486,7 +486,7 @@ func genericCollectionBreak<T : Collection>(_ xx: T) {
 // CHECK:   switch_enum_addr [[ELT_STACK]] : $*Optional<T.Element>, case #Optional.some!enumelt: [[SOME_BB:bb[0-9]+]], case #Optional.none!enumelt: [[NONE_BB:bb[0-9]+]]
 //
 // CHECK: [[SOME_BB]]:
-// CHECK:   [[T0:%.*]] = alloc_stack $T.Element, let, name "x"
+// CHECK:   [[T0:%.*]] = alloc_stack [lexical] $T.Element, let, name "x"
 // CHECK:   [[ELT_STACK_TAKE:%.*]] = unchecked_take_enum_data_addr [[ELT_STACK]] : $*Optional<T.Element>, #Optional.some!enumelt
 // CHECK:   copy_addr [take] [[ELT_STACK_TAKE]] to [initialization] [[T0]]
 // CHECK:   cond_br {{%.*}}, [[LOOP_BREAK_END_BLOCK:bb[0-9]+]], [[CONTINUE_CHECK_BLOCK:bb[0-9]+]]
@@ -624,7 +624,7 @@ func injectForEachElementIntoOptional(_ xs: [Int]) {
 // CHECK: copy_addr [take] [[NEXT_RESULT:%.*]] to [initialization] [[NEXT_RESULT_COPY:%.*]] : $*Optional<T>
 // CHECK: switch_enum_addr [[NEXT_RESULT_COPY]] : $*Optional<T>, case #Optional.some!enumelt: [[BB_SOME:bb.*]], case
 // CHECK: [[BB_SOME]]:
-// CHECK: [[X_BINDING:%.*]] = alloc_stack $Optional<T>, let, name "x"
+// CHECK: [[X_BINDING:%.*]] = alloc_stack [lexical] $Optional<T>, let, name "x"
 // CHECK: [[ADDR:%.*]] = unchecked_take_enum_data_addr [[NEXT_RESULT_COPY]] : $*Optional<T>, #Optional.some!enumelt
 // CHECK: [[X_ADDR:%.*]] = init_enum_data_addr [[X_BINDING]] : $*Optional<T>, #Optional.some!enumelt
 // CHECK: copy_addr [take] [[ADDR]] to [initialization] [[X_ADDR]] : $*T
diff --git a/test/SILGen/guaranteed_closure_context.swift b/test/SILGen/guaranteed_closure_context.swift
@@ -22,7 +22,7 @@ func guaranteed_captures() {
   // CHECK: [[IMMUTABLE_RETAINABLE:%.*]] = apply {{.*}} -> @owned C
   // CHECK: [[B_IMMUTABLE_RETAINABLE:%.*]] = begin_borrow [lexical] [[IMMUTABLE_RETAINABLE]] : $C
   let immutableRetainable = C()
-  // CHECK: [[IMMUTABLE_ADDRESS_ONLY:%.*]] = alloc_stack $P
+  // CHECK: [[IMMUTABLE_ADDRESS_ONLY:%.*]] = alloc_stack [lexical] $P
   let immutableAddressOnly: P = C()
 
   func captureEverything() {
diff --git a/test/SILGen/guaranteed_normal_args.swift b/test/SILGen/guaranteed_normal_args.swift
@@ -170,7 +170,7 @@ struct ReabstractionThunkTest : Protocol {
 // result.
 extension FakeDictionary {
   // CHECK-LABEL: sil hidden [ossa] @$ss14FakeDictionaryV20makeSureToCopyTuplesyyF : $@convention(method) <Key, Value> (FakeDictionary<Key, Value>) -> () {
-  // CHECK:   [[X:%.*]] = alloc_stack $(Key, Value), let, name "x"
+  // CHECK:   [[X:%.*]] = alloc_stack [lexical] $(Key, Value), let, name "x"
   // CHECK:   [[INDUCTION_VAR:%.*]] = unchecked_take_enum_data_addr {{%.*}} : $*Optional<(Key, Value)>, #Optional.some!enumelt
   // CHECK:   [[INDUCTION_VAR_0:%.*]] = tuple_element_addr [[INDUCTION_VAR]] : $*(Key, Value), 0
   // CHECK:   [[INDUCTION_VAR_1:%.*]] = tuple_element_addr [[INDUCTION_VAR]] : $*(Key, Value), 1
diff --git a/test/SILGen/if_while_binding.swift b/test/SILGen/if_while_binding.swift
@@ -106,7 +106,7 @@ func while_loop() {
 // CHECK-LABEL: sil hidden [ossa] @$s16if_while_binding0B13_loop_generic{{[_0-9a-zA-Z]*}}F
 // CHECK:         br [[COND:bb[0-9]+]]
 // CHECK:       [[COND]]:
-// CHECK:         [[X:%.*]] = alloc_stack $T, let, name "x"
+// CHECK:         [[X:%.*]] = alloc_stack [lexical] $T, let, name "x"
 // CHECK:         [[OPTBUF:%[0-9]+]] = alloc_stack $Optional<T>
 // CHECK:         switch_enum_addr {{.*}}, case #Optional.some!enumelt: [[LOOPBODY:bb.*]], case #Optional.none!enumelt: [[OUT:bb[0-9]+]]
 // CHECK:       [[LOOPBODY]]:
diff --git a/test/SILGen/indirect_enum.swift b/test/SILGen/indirect_enum.swift
@@ -347,7 +347,7 @@ func guardTreeA<T>(_ tree: TreeA<T>) {
     // CHECK: [[YES]]:
     guard case .Nil = tree else { return }
 
-    // CHECK:   [[X:%.*]] = alloc_stack $T
+    // CHECK:   [[X:%.*]] = alloc_stack [lexical] $T
     // CHECK:   [[ARG_COPY:%.*]] = copy_value [[ARG]]
     // CHECK:   switch_enum [[ARG_COPY]] : $TreeA<T>, case #TreeA.Leaf!enumelt: [[YES:bb[0-9]+]], default [[NO2:bb[0-9]+]]
     // CHECK: [[YES]]([[BOX:%.*]] : @owned $<τ_0_0> { var τ_0_0 } <T>):
@@ -383,7 +383,7 @@ func guardTreeA<T>(_ tree: TreeA<T>) {
     // CHECK:   br
     if case .Nil = tree { }
 
-    // CHECK:   [[X:%.*]] = alloc_stack $T
+    // CHECK:   [[X:%.*]] = alloc_stack [lexical] $T
     // CHECK:   [[ARG_COPY:%.*]] = copy_value [[ARG]]
     // CHECK:   switch_enum [[ARG_COPY]] : $TreeA<T>, case #TreeA.Leaf!enumelt: [[YES:bb[0-9]+]], default [[NO5:bb[0-9]+]]
     // CHECK: [[NO5]]([[ORIGINAL_VALUE:%.*]] : @owned $TreeA<T>):
@@ -429,7 +429,7 @@ func guardTreeB<T>(_ tree: TreeB<T>) {
     // CHECK:   destroy_addr [[TMP1]]
     guard case .Nil = tree else { return }
 
-    // CHECK:   [[X:%.*]] = alloc_stack $T
+    // CHECK:   [[X:%.*]] = alloc_stack [lexical] $T
     // CHECK:   copy_addr %0 to [initialization] [[TMP2:%.*]] :
     // CHECK:   switch_enum_addr [[TMP2]] : $*TreeB<T>, case #TreeB.Leaf!enumelt: [[YES:bb[0-9]+]], default [[NO2:bb[0-9]+]]
     // CHECK: [[YES]]:
@@ -438,8 +438,8 @@ func guardTreeB<T>(_ tree: TreeB<T>) {
     // CHECK:   dealloc_stack [[TMP2]]
     guard case .Leaf(let x) = tree else { return }
 
-    // CHECK:   [[L:%.*]] = alloc_stack $TreeB
-    // CHECK:   [[R:%.*]] = alloc_stack $TreeB
+    // CHECK:   [[L:%.*]] = alloc_stack [lexical] $TreeB
+    // CHECK:   [[R:%.*]] = alloc_stack [lexical] $TreeB
     // CHECK:   copy_addr %0 to [initialization] [[TMP3:%.*]] :
     // CHECK:   switch_enum_addr [[TMP3]] : $*TreeB<T>, case #TreeB.Branch!enumelt: [[YES:bb[0-9]+]], default [[NO3:bb[0-9]+]]
     // CHECK: [[YES]]:
@@ -468,7 +468,7 @@ func guardTreeB<T>(_ tree: TreeB<T>) {
     // CHECK:   destroy_addr [[TMP]]
     if case .Nil = tree { }
 
-    // CHECK:   [[X:%.*]] = alloc_stack $T
+    // CHECK:   [[X:%.*]] = alloc_stack [lexical] $T
     // CHECK:   copy_addr %0 to [initialization] [[TMP:%.*]] :
     // CHECK:   switch_enum_addr [[TMP]] : $*TreeB<T>, case #TreeB.Leaf!enumelt: [[YES:bb[0-9]+]], default [[NO:bb[0-9]+]]
     // CHECK: [[NO]]:
@@ -480,8 +480,8 @@ func guardTreeB<T>(_ tree: TreeB<T>) {
     // CHECK:   destroy_addr [[X]]
     if case .Leaf(let x) = tree { }
 
-    // CHECK:   [[L:%.*]] = alloc_stack $TreeB
-    // CHECK:   [[R:%.*]] = alloc_stack $TreeB
+    // CHECK:   [[L:%.*]] = alloc_stack [lexical] $TreeB
+    // CHECK:   [[R:%.*]] = alloc_stack [lexical] $TreeB
     // CHECK:   copy_addr %0 to [initialization] [[TMP:%.*]] :
     // CHECK:   switch_enum_addr [[TMP]] : $*TreeB<T>, case #TreeB.Branch!enumelt: [[YES:bb[0-9]+]], default [[NO:bb[0-9]+]]
     // CHECK: [[NO]]:
diff --git a/test/SILGen/let_decls.swift b/test/SILGen/let_decls.swift
@@ -340,7 +340,7 @@ func testDebugValue(_ a : Int, b : SimpleProtocol) -> Int {
 // CHECK-LABEL: sil hidden [ossa] @{{.*}}testAddressOnlyTupleArgument
 func testAddressOnlyTupleArgument(_ bounds: (start: SimpleProtocol, pastEnd: Int)) {
 // CHECK:       bb0(%0 : $*SimpleProtocol, %1 : $Int):
-// CHECK-NEXT:    %2 = alloc_stack $(start: SimpleProtocol, pastEnd: Int), let, name "bounds", argno 1
+// CHECK-NEXT:    %2 = alloc_stack [lexical] $(start: SimpleProtocol, pastEnd: Int), let, name "bounds", argno 1
 // CHECK-NEXT:    %3 = tuple_element_addr %2 : $*(start: SimpleProtocol, pastEnd: Int), 0
 // CHECK-NEXT:    copy_addr %0 to [initialization] %3 : $*SimpleProtocol
 // CHECK-NEXT:    %5 = tuple_element_addr %2 : $*(start: SimpleProtocol, pastEnd: Int), 1
@@ -507,7 +507,7 @@ struct LetDeclInStruct {
 func test_unassigned_let_constant() {
   let string : String
 }
-// CHECK: [[S:%[0-9]+]] = alloc_stack $String, let, name "string"
+// CHECK: [[S:%[0-9]+]] = alloc_stack [lexical] $String, let, name "string"
 // CHECK-NEXT:  [[MUI:%[0-9]+]] = mark_uninitialized [var] [[S]] : $*String
 // CHECK-NEXT:  destroy_addr [[MUI]] : $*String
 // CHECK-NEXT:  dealloc_stack [[S]] : $*String
diff --git a/test/SILGen/switch.swift b/test/SILGen/switch.swift
diff --git a/test/SILGen/switch_multiple_entry_address_only.swift b/test/SILGen/switch_multiple_entry_address_only.swift
diff --git a/test/SILGen/switch_resilience.swift b/test/SILGen/switch_resilience.swift
diff --git a/test/SILGen/tuples.swift b/test/SILGen/tuples.swift
diff --git a/test/SILOptimizer/access_marker_verify.swift b/test/SILOptimizer/access_marker_verify.swift

Original file line number	Diff line number	Diff line change
`@@ -1027,7 +1027,8 @@ RValue RValueEmitter::visitLoadExpr(LoadExpr *E, SGFContext C) {`
`1027`	`1027`	`}`
`1028`	`1028`
`1029`	`1029`	`SILValue SILGenFunction::emitTemporaryAllocation(SILLocation loc, SILType ty,`
`1030`		`- bool hasDynamicLifetime) {`
	`1030`	`+ bool hasDynamicLifetime,`
	`1031`	`+ bool isLexical) {`
`1031`	`1032`	`ty = ty.getObjectType();`
`1032`	`1033`	`Optional<SILDebugVariable> DbgVar;`
`1033`	`1034`	`if (auto *VD = loc.getAsASTNode<VarDecl>())`
`@@ -1042,7 +1043,8 @@ SILValue SILGenFunction::emitTemporaryAllocation(SILLocation loc, SILType ty,`
`1042`	`1043`	`DbgVar = SILDebugVariable(VD->isLet(), 0);`
`1043`	`1044`	`loc = SILLocation(VD);`
`1044`	`1045`	`}`
`1045`		`- auto alloc = B.createAllocStack(loc, ty, DbgVar, hasDynamicLifetime);`
	`1046`	`+ auto *alloc =`
	`1047`	`+ B.createAllocStack(loc, ty, DbgVar, hasDynamicLifetime, isLexical);`
`1046`	`1048`	`enterDeallocStackCleanup(alloc);`
`1047`	`1049`	`return alloc;`
`1048`	`1050`	`}`
Original file line number	Diff line number	Diff line change
`@@ -290,10 +290,12 @@ struct ArgumentInitHelper {`
`290`	`290`	`}`
`291`	`291`	`SGF.B.createDebugValue(loc, value, varinfo);`
`292`	`292`	`} else {`
`293`		`- if (auto AllocStack = dyn_cast<AllocStackInst>(value))`
`294`		`- AllocStack->setArgNo(ArgNo);`
`295`		`- else`
	`293`	`+ if (auto *allocStack = dyn_cast<AllocStackInst>(value)) {`
	`294`	`+ allocStack->setArgNo(ArgNo);`
	`295`	`+ allocStack->setIsLexical();`
	`296`	`+ } else {`
`296`	`297`	`SGF.B.createDebugValueAddr(loc, value, varinfo);`
	`298`	`+ }`
`297`	`299`	`}`
`298`	`300`	`SGF.VarLocs[pd] = SILGenFunction::VarLoc::get(value);`
`299`	`301`	`}`