diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
index e29a174..a43649d 100644
--- a/lib/CodeGen/CGBuiltin.cpp
+++ b/lib/CodeGen/CGBuiltin.cpp
@@ -262,6 +262,14 @@
     Builder.CreateCall(CGM.getMemCpyFn(), MemCpyOps, MemCpyOps+4);
     return RValue::get(MemCpyOps[0]);
   }
+  case Builtin::BI__builtin_return_address: {
+    Value *F = CGM.getIntrinsic(Intrinsic::returnaddress, 0, 0);
+    return RValue::get(Builder.CreateCall(F, EmitScalarExpr(E->getArg(0))));
+  }
+  case Builtin::BI__builtin_frame_address: {
+    Value *F = CGM.getIntrinsic(Intrinsic::frameaddress, 0, 0);
+    return RValue::get(Builder.CreateCall(F, EmitScalarExpr(E->getArg(0))));
+  }
   case Builtin::BI__sync_fetch_and_add:
     return EmitBinaryAtomic(*this, Intrinsic::atomic_las, E);
   case Builtin::BI__sync_fetch_and_sub:
diff --git a/test/CodeGen/builtin-stackaddress.c b/test/CodeGen/builtin-stackaddress.c
new file mode 100644
index 0000000..2b9c799
--- /dev/null
+++ b/test/CodeGen/builtin-stackaddress.c
@@ -0,0 +1,16 @@
+// RUN: clang -emit-llvm < %s
+void* a(unsigned x) {
+return __builtin_return_address(0);
+}
+
+void* c(unsigned x) {
+return __builtin_frame_address(0);
+}
+// RUN: clang -emit-llvm < %s
+void* a(unsigned x) {
+return __builtin_return_address(0);
+}
+
+void* c(unsigned x) {
+return __builtin_frame_address(0);
+}