Merge pull request #69907 from kavon/noncopyable-statics-117082469

[SILGen] handle TypeExpr in BorrowedBaseVisitor

Author: kavon

lib/SILGen/SILGenLValue.cpp

@@ -2931,9 +2931,12 @@ class LLVM_LIBRARY_VISIBILITY SILGenBorrowedBaseVisitor
 public:
   SILGenLValue &SGL;
   SILGenFunction &SGF;
+  AbstractionPattern Orig;
 
-  SILGenBorrowedBaseVisitor(SILGenLValue &SGL, SILGenFunction &SGF)
-      : SGL(SGL), SGF(SGF) {}
+  SILGenBorrowedBaseVisitor(SILGenLValue &SGL,
+                            SILGenFunction &SGF,
+                            AbstractionPattern Orig)
+      : SGL(SGL), SGF(SGF), Orig(Orig) {}
 
   static bool isNonCopyableBaseBorrow(SILGenFunction &SGF, Expr *e) {
     if (auto *m = dyn_cast<MemberRefExpr>(e)) {
@@ -2982,9 +2985,14 @@ class LLVM_LIBRARY_VISIBILITY SILGenBorrowedBaseVisitor
     return false;
   }
 
+  /// For any other Expr's that this SILGenBorrowedBaseVisitor doesn't already
+  /// define a visitor stub, defer back to SILGenLValue's visitRec as it is
+  /// most-likely a non-lvalue root expression.
   LValue visitExpr(Expr *e, SGFAccessKind accessKind, LValueOptions options) {
-    e->dump(llvm::errs());
-    llvm::report_fatal_error("Unimplemented node!");
+    assert(!isNonCopyableBaseBorrow(SGF, e)
+            && "unexpected recursion in SILGenLValue::visitRec!");
+
+    return SGL.visitRec(e, accessKind, options, Orig);
   }
 
   LValue visitMemberRefExpr(MemberRefExpr *e, SGFAccessKind accessKind,
@@ -3074,10 +3082,10 @@ LValue SILGenLValue::visitRec(Expr *e, SGFAccessKind accessKind,
   // apply the lvalue within a formal access to the original value instead of
   // an actual loaded copy.
   if (SILGenBorrowedBaseVisitor::isNonCopyableBaseBorrow(SGF, e)) {
-    SILGenBorrowedBaseVisitor visitor(*this, SGF);
+    SILGenBorrowedBaseVisitor visitor(*this, SGF, orig);
     auto accessKind = SGFAccessKind::BorrowedObjectRead;
-    if (e->getType()->is<LValueType>())
-      accessKind = SGFAccessKind::BorrowedAddressRead;
+    assert(!e->getType()->is<LValueType>()
+        && "maybe need SGFAccessKind::BorrowedAddressRead ?");
     return visitor.visit(e, accessKind, options);
   }
 

test/Interpreter/moveonly.swift

@@ -133,3 +133,29 @@ Tests.test("AddressOnly") {
     }
 }
 
+// coverage for rdar://117082469
+Tests.test("global borrowing access") {
+  class Retainable { var data = 0 }
+
+  struct HasStatic : ~Copyable {
+    var x = 1
+    var y = Retainable()
+
+    static let a = HasStatic()
+    static var b = HasStatic()
+  }
+
+  // test the let 'a'
+  expectEqual(HasStatic.a.x, 1)
+  expectEqual(HasStatic.a.y.data, 0)
+
+  // test the var 'b'
+  expectEqual(HasStatic.b.x, 1)
+  HasStatic.b.x += 10
+  expectEqual(HasStatic.b.x, 11)
+
+  expectEqual(HasStatic.b.y.data, 0)
+  HasStatic.b.y.data += 121
+  expectEqual(HasStatic.b.y.data, 121)
+}
+

test/SILGen/moveonly_basics.swift

@@ -0,0 +1,29 @@
+// RUN: %target-swift-emit-silgen -module-name test %s | %FileCheck %s --enable-var-scope
+
+class Retainable {}
+
+struct HasStatic : ~Copyable {
+  var x = 1
+  var y = Retainable()
+  static let b = HasStatic()
+}
+
+// coverage for rdar://117082469
+// CHECK-LABEL: sil hidden [ossa] @$s4test0A11HasStatic_1yyF : $@convention(thin) () -> () {
+// CHECK:         [[ADDRESSOR:%.*]] = function_ref @$s4test9HasStaticV1bACvau : $@convention(thin) () -> Builtin.RawPointer
+// CHECK:         [[PTR:%.*]] = apply [[ADDRESSOR]]() : $@convention(thin) () -> Builtin.RawPointer
+// CHECK:         [[ADDR:%.*]] = pointer_to_address [[PTR]] : $Builtin.RawPointer to [strict] $*HasStatic
+// CHECK:         [[MARK:%.*]] = mark_unresolved_non_copyable_value [no_consume_or_assign] [[ADDR]] : $*HasStatic
+// CHECK:         [[X_ADDR:%.*]] = struct_element_addr [[MARK]] : $*HasStatic, #HasStatic.x
+// CHECK:         = load [trivial] [[X_ADDR]] : $*Int
+func testHasStatic_1() {
+  _ = HasStatic.b.x
+}
+
+// CHECK-LABEL: sil hidden [ossa] @$s4test0A11HasStatic_2yyF : $@convention(thin) () -> () {
+// CHECK:         [[MARK:%.*]] = mark_unresolved_non_copyable_value [no_consume_or_assign] {{%.*}} : $*HasStatic
+// CHECK:         [[Y_ADDR:%.*]] = struct_element_addr [[MARK]] : $*HasStatic, #HasStatic.y
+// CHECK:         = load [copy] [[Y_ADDR]] : $*Retainable
+func testHasStatic_2() {
+  _ = HasStatic.b.y
+}