diff --git a/llvm/test/FrontendC++/m64-ptr.cpp b/llvm/test/FrontendC++/m64-ptr.cpp
new file mode 100644
index 000000000000..8d1bb7a69845
--- /dev/null
+++ b/llvm/test/FrontendC++/m64-ptr.cpp
@@ -0,0 +1,17 @@
+// RUN: %llvmgxx %s -S -o - | FileCheck %s
+// Make sure pointers are passed as pointers, not converted to int.
+// The first load should be of type i8** in either 32 or 64 bit mode.
+// This formerly happened on x86-64, 7375899.
+
+class StringRef {
+public:
+  const char *Data;
+  long Len;
+};
+void foo(StringRef X);
+void bar(StringRef &A) {
+// CHECK: @_Z3barR9StringRef
+// CHECK: load i8**
+  foo(A);
+// CHECK: ret void
+}