---

yaml
---
r: 348339
b: refs/heads/master
c: 697b29e
h: refs/heads/master
i:
  348337: 69b8483
  348335: 4326daa

Author: gmittert

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d83a17fe07cffcea8df26ba40331b669508e8d0f
+refs/heads/master: 697b29e875788f8a66338c5d62be5332c3263acc
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/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,