---

yaml
---
r: 348317
b: refs/heads/master
c: 7c60b58
h: refs/heads/master
i:
  348315: c5e8985

Author: plotfi

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6081bcf191ccff8a18408118dc9e17c95c5ee033
+refs/heads/master: 7c60b58c976a76855a5b9fccc534b80a833cdf0a
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/test/IRGen/generic_metatypes.swift

@@ -146,4 +146,4 @@ func makeGenericMetatypes() {
 // CHECK:   ret %swift.metadata_response
 
 // CHECK: attributes [[NOUNWIND_READNONE]] = { nounwind readnone }
-// CHECK: attributes [[NOUNWIND_OPT]] = { noinline nounwind "no-frame-pointer-elim"="false" {{.*}} "target-cpu"
+// CHECK: attributes [[NOUNWIND_OPT]] = { nounwind "frame-pointer"="all" "target-cpu"