---

yaml
---
r: 270271
b: refs/heads/tensorflow-merge
c: 9c9ad09
h: refs/heads/master
i:
  270269: 7eff42e
  270267: db9e1b1
  270263: 5614870
  270255: 46ada06
  270239: 8454264
  270207: 5bf81ef

Author: slavapestov

[refs]

@@ -1128,4 +1128,4 @@ refs/tags/swift-4.2.1-RELEASE: 02a6ca969ea1387475b6caeb69c31186df7d30b6
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2018-11-01-a: 3b0299288f8287094b9ef587f46df54f42a347af
 refs/heads/5.0-add-libcxx-and-clang-tools-extra: eb6e6f9b0a551e7804e96d0dac83add11ec73977
 refs/heads/Fix-DataCreateSmall: e15aff31b7406a5b2dadac9d7810941cec85035a
-refs/heads/tensorflow-merge: 5e617b5cb9c39b86a1d70e1ad6def329d95531fc
+refs/heads/tensorflow-merge: 9c9ad09f15c34e383823c576266de0470b4e410f

branches/tensorflow-merge/lib/SIL/SILVerifier.cpp

@@ -1477,8 +1477,13 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
   }
 
   void checkAllocGlobalInst(AllocGlobalInst *AGI) {
+    SILGlobalVariable *RefG = AGI->getReferencedGlobal();
+    if (auto *VD = RefG->getDecl()) {
+      require(!VD->isResilient(F.getModule().getSwiftModule(),
+                               F.getResilienceExpansion()),
+              "cannot access storage of resilient global");
+    }
     if (F.isSerialized()) {
-      SILGlobalVariable *RefG = AGI->getReferencedGlobal();
       require(RefG->isSerialized()
                 || hasPublicVisibility(RefG->getLinkage()),
               "alloc_global inside fragile function cannot "
@@ -1490,6 +1495,11 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
     SILGlobalVariable *RefG = GAI->getReferencedGlobal();
     require(GAI->getType().getObjectType() == RefG->getLoweredType(),
             "global_addr/value must be the type of the variable it references");
+    if (auto *VD = RefG->getDecl()) {
+      require(!VD->isResilient(F.getModule().getSwiftModule(),
+                               F.getResilienceExpansion()),
+              "cannot access storage of resilient global");
+    }
     if (F.isSerialized()) {
       require(RefG->isSerialized()
               || hasPublicVisibility(RefG->getLinkage()),