Index: lib/Transforms/IPO/FunctionAttrs.cpp
===================================================================
--- lib/Transforms/IPO/FunctionAttrs.cpp
+++ lib/Transforms/IPO/FunctionAttrs.cpp
@@ -89,7 +89,23 @@
     // Some instructions can be ignored even if they read or write memory.
     // Detect these now, skipping to the next instruction if one is found.
     CallSite CS(cast<Value>(I));
-    if (CS) {
+    if (auto *II = dyn_cast<IntrinsicInst>(I)) {
+      // These intrinsics will show up as affecting memory, but they are just
+      // markers.
+      bool IsMarker = false;
+      switch (II->getIntrinsicID()) {
+      default:
+        break;
+      case Intrinsic::lifetime_start:
+      case Intrinsic::lifetime_end:
+      case Intrinsic::invariant_start:
+      case Intrinsic::invariant_end:
+      case Intrinsic::assume:
+        IsMarker = true;
+      }
+      if (IsMarker)
+        continue;
+    } else if (CS) {
       // Ignore calls to functions in the same SCC, as long as the call sites
       // don't have operand bundles.  Calls with operand bundles are allowed to
       // have memory effects not described by the memory effects of the call