diff --git a/lib/Analysis/MemoryLocation.cpp b/lib/Analysis/MemoryLocation.cpp
index 55924db284e..43cebcd7a30 100644
--- a/lib/Analysis/MemoryLocation.cpp
+++ b/lib/Analysis/MemoryLocation.cpp
@@ -137,6 +137,10 @@ MemoryLocation MemoryLocation::getForArgument(ImmutableCallSite CS,
           Arg, cast<ConstantInt>(II->getArgOperand(0))->getZExtValue(), AATags);
 
     case Intrinsic::invariant_end:
+      // The first argument to an invariant.end is a "descriptor" type (e.g. a
+      // pointer to a empty struct) which is never actually dereferenced.
+      if (ArgIdx == 0)
+        return MemoryLocation(Arg, 0, AATags);
       assert(ArgIdx == 2 && "Invalid argument index");
       return MemoryLocation(
           Arg, cast<ConstantInt>(II->getArgOperand(1))->getZExtValue(), AATags);
diff --git a/test/Transforms/LICM/invariant.start.ll b/test/Transforms/LICM/invariant.start.ll
index 6c587ac3f2a..ff17bd096ce 100644
--- a/test/Transforms/LICM/invariant.start.ll
+++ b/test/Transforms/LICM/invariant.start.ll
@@ -101,9 +101,7 @@ loop:
   store i32 0, i32* %ptr
   %scope = call {}* @llvm.invariant.start.p0i32(i64 4, i32* %ptr)
   %val = load i32, i32* %ptr
-;;  NOTE: despite being correct syntax, uncommenting this line causes
-;;  a crash in the optimizer.  FIXME
-;;  call void @llvm.invariant.end.p0i32({}* %scope, i64 4, i32* %ptr)
+  call void @llvm.invariant.end.p0i32({}* %scope, i64 4, i32* %ptr)
   %x.inc = add i32 %x, %val
   br label %loop
 }