diff --git a/test/CodeGenCXX/member-function-pointers.cpp b/test/CodeGenCXX/member-function-pointers.cpp
index 9f322a7..bf24aea 100644
--- a/test/CodeGenCXX/member-function-pointers.cpp
+++ b/test/CodeGenCXX/member-function-pointers.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - -triple=x86_64-apple-darwin9 -O2 | FileCheck %s
+// RUN: clang-cc %s -emit-llvm -o - -triple=x86_64-apple-darwin9 | FileCheck %s
 
 struct A { int a; };
 struct B { int b; };
@@ -9,17 +9,17 @@
 void (B::*pb)();
 void (C::*pc)();
 
-
 void f() {
-  // CHECK: store i64 0, i64* getelementptr inbounds (%0* @pa, i64 0, i32 0)
-  // CHECK: store i64 0, i64* getelementptr inbounds (%0* @pa, i64 0, i32 1)
+  // CHECK: store i64 0, i64* getelementptr inbounds (%0* @pa, i32 0, i32 0)
+  // CHECK: store i64 0, i64* getelementptr inbounds (%0* @pa, i32 0, i32 1)
   pa = 0;
-  
-  // CHECK: volatile store i64 0, i64* getelementptr inbounds (%0* @vpa, i64 0, i32 0)
-  // CHECK: volatile store i64 0, i64* getelementptr inbounds (%0* @vpa, i64 0, i32 1)
+
+  // CHECK: volatile store i64 0, i64* getelementptr inbounds (%0* @vpa, i32 0, i32 0)
+  // CHECK: volatile store i64 0, i64* getelementptr inbounds (%0* @vpa, i32 0, i32 1)
   vpa = 0;
- 
-  // CHECK: store i64 0, i64* getelementptr inbounds (%0* @pc, i64 0, i32 0) 
-  // CHECK: store i64 4, i64* getelementptr inbounds (%0* @pc, i64 0, i32 1)
-  pc = pa;
+
+  // CHECK: store i64 %0, i64* getelementptr inbounds (%0* @pc, i32 0, i32 0)
+  // CHECK: [[ADJ:%[a-zA-Z0-9]+]] = add i64 %1, 4
+  // CHECK: store i64 [[ADJ]], i64* getelementptr inbounds (%0* @pc, i32 0, i32 1)
+  pc = pa;  
 }