---

yaml
---
r: 349503
b: refs/heads/master-next
c: 697b29e
h: refs/heads/master
i:
  349501: c80e4c6
  349499: 820ea05
  349495: 8a8555a
  349487: 6bc07e4
  349471: 9631ff8
  349439: 5ea090b

Author: gmittert

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 3574c513bbc5578dd9346b4ea9ab5995c5927bb5
-refs/heads/master-next: d83a17fe07cffcea8df26ba40331b669508e8d0f
+refs/heads/master-next: 697b29e875788f8a66338c5d62be5332c3263acc
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-b: 66d897bfcf64a82cb9a87f5e663d889189d06d07

branches/master-next/lib/IRGen/IRGenModule.cpp

@@ -896,13 +896,7 @@ bool swift::irgen::shouldRemoveTargetFeature(StringRef feature) {
 
 void IRGenModule::setHasFramePointer(llvm::AttrBuilder &Attrs,
                                      bool HasFramePointer) {
-  if (HasFramePointer) {
-    Attrs.addAttribute("no-frame-pointer-elim", "true");
-    Attrs.addAttribute("no-frame-pointer-elim-non-leaf");
-  } else {
-    Attrs.addAttribute("no-frame-pointer-elim", "false");
-    Attrs.removeAttribute("no-frame-pointer-elim-non-leaf");
-  }
+  Attrs.addAttribute("frame-pointer", HasFramePointer ? "all" : "none");
 }
 
 void IRGenModule::setHasFramePointer(llvm::Function *F,