Merge pull request #9016 from atrick/fix

Author: swift-ci

lib/SILGen/SILGenLValue.cpp

@@ -130,11 +130,18 @@ static LValueTypeData getPhysicalStorageTypeData(SILGenModule &SGM,
 }
 
 static bool shouldUseUnsafeEnforcement(VarDecl *var) {
-  return false; // TODO
+  if (var->isDebuggerVar())
+    return true;
+
+  // TODO: Check for the explicit "unsafe" attribute.
+  return false;
 }
 
 Optional<SILAccessEnforcement>
 SILGenFunction::getStaticEnforcement(VarDecl *var) {
+  if (var && shouldUseUnsafeEnforcement(var))
+    return SILAccessEnforcement::Unsafe;
+
   return SILAccessEnforcement::Static;
 }
 
@@ -150,6 +157,9 @@ SILGenFunction::getDynamicEnforcement(VarDecl *var) {
 
 Optional<SILAccessEnforcement>
 SILGenFunction::getUnknownEnforcement(VarDecl *var) {
+  if (var && shouldUseUnsafeEnforcement(var))
+    return SILAccessEnforcement::Unsafe;
+
   return SILAccessEnforcement::Unknown;
 }
 

lib/SILOptimizer/Mandatory/AccessEnforcementSelection.cpp

@@ -382,12 +382,7 @@ struct AccessEnforcementSelection : SILFunctionTransform {
     // dependent BeginAccess).
     //
     // Running before diagnostic constant propagation requires handling 'undef'.
-    //
-    // FIXME: This assert will eventually be important, but for now it's safe to
-    // disable until this problem is resolved:
-    //   <rdar://problem/31797132> [Exclusivity] lldb asserts in
-    //   AccessEnforcementSelector
-    // assert(isa<AllocStackInst>(address) || isa<SILUndef>(address));
+    assert(isa<AllocStackInst>(address) || isa<SILUndef>(address));
     setStaticEnforcement(access);
   }