Index: lib/CodeGen/CodeGenFunction.cpp
===================================================================
--- lib/CodeGen/CodeGenFunction.cpp	(revision 167457)
+++ lib/CodeGen/CodeGenFunction.cpp	(working copy)
@@ -422,7 +422,8 @@
   EmitStartEHSpec(CurCodeDecl);
 
   PrologueCleanupDepth = EHStack.stable_begin();
-  EmitFunctionProlog(*CurFnInfo, CurFn, Args);
+  if(!D->hasAttr<NakedAttr>())
+    EmitFunctionProlog(*CurFnInfo, CurFn, Args);
 
   if (D && isa<CXXMethodDecl>(D) && cast<CXXMethodDecl>(D)->isInstance()) {
     CGM.getCXXABI().EmitInstanceFunctionProlog(*this);