Index: llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp
===================================================================
--- llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp
+++ llvm/trunk/lib/Transforms/InstCombine/InstCombineCalls.cpp
@@ -30,8 +30,6 @@
 
 STATISTIC(NumSimplified, "Number of library calls simplified");
 
-extern cl::opt<bool> ClUseAfterScope;
-
 /// Return the specified type promoted as it would be to pass though a va_arg
 /// area.
 static Type *getPromotedType(Type *Ty) {
@@ -2244,18 +2242,16 @@
       return eraseInstFromFunction(CI);
     break;
   }
-  case Intrinsic::lifetime_start: {
-    const Function *func = II->getFunction();
-    // Asan needs to poison memory to detect invalid access possible even for
-    // empty lifetime range.
-    if (func && func->hasFnAttribute(Attribute::SanitizeAddress))
+  case Intrinsic::lifetime_start:
+    // Asan needs to poison memory to detect invalid access which is possible
+    // even for empty lifetime range.
+    if (II->getFunction()->hasFnAttribute(Attribute::SanitizeAddress))
       break;
 
     if (removeTriviallyEmptyRange(*II, Intrinsic::lifetime_start,
                                   Intrinsic::lifetime_end, *this))
       return nullptr;
     break;
-  }
   case Intrinsic::assume: {
     Value *IIOperand = II->getArgOperand(0);
     // Remove an assume if it is immediately followed by an identical assume.
@@ -2486,6 +2482,7 @@
 
 /// Improvements for call and invoke instructions.
 Instruction *InstCombiner::visitCallSite(CallSite CS) {
+
   if (isAllocLikeFn(CS.getInstruction(), TLI))
     return visitAllocSite(*CS.getInstruction());
 
Index: llvm/trunk/test/Transforms/InstCombine/lifetime-asan.ll
===================================================================
--- llvm/trunk/test/Transforms/InstCombine/lifetime-asan.ll
+++ llvm/trunk/test/Transforms/InstCombine/lifetime-asan.ll
@@ -7,15 +7,14 @@
 define void @asan() sanitize_address {
 entry:
   ; CHECK-LABEL: @asan(
-  %text = alloca [1 x i8], align 1
-  %0 = getelementptr inbounds [1 x i8], [1 x i8]* %text, i64 0, i64 0
+  %text = alloca i8, align 1
 
-  call void @llvm.lifetime.start(i64 1, i8* %0)
-  call void @llvm.lifetime.end(i64 1, i8* %0)
+  call void @llvm.lifetime.start(i64 1, i8* %text)
+  call void @llvm.lifetime.end(i64 1, i8* %text)
   ; CHECK: call void @llvm.lifetime.start
   ; CHECK-NEXT: call void @llvm.lifetime.end
 
-  call void @foo(i8* %0) ; Keep alloca alive
+  call void @foo(i8* %text) ; Keep alloca alive
 
   ret void
 }
@@ -24,14 +23,13 @@
 define void @no_asan() {
 entry:
   ; CHECK-LABEL: @no_asan(
-  %text = alloca [1 x i8], align 1
-  %0 = getelementptr inbounds [1 x i8], [1 x i8]* %text, i64 0, i64 0
+  %text = alloca i8, align 1
 
-  call void @llvm.lifetime.start(i64 1, i8* %0)
-  call void @llvm.lifetime.end(i64 1, i8* %0)
+  call void @llvm.lifetime.start(i64 1, i8* %text)
+  call void @llvm.lifetime.end(i64 1, i8* %text)
   ; CHECK-NO: call void @llvm.lifetime
 
-  call void @foo(i8* %0) ; Keep alloca alive
+  call void @foo(i8* %text) ; Keep alloca alive
 
   ret void
 }