---

yaml
---
r: 348599
b: refs/heads/master
c: 41eb451
h: refs/heads/master
i:
  348597: ef55859
  348595: 5c244b3
  348591: a993c53

Author: swift-ci

[refs]

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

trunk/lib/SIL/SILVerifier.cpp

@@ -1630,8 +1630,16 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
 
   void checkBuiltinInst(BuiltinInst *BI) {
     // Check for special constraints on llvm intrinsics.
-    if (BI->getIntrinsicInfo().ID != llvm::Intrinsic::not_intrinsic)
+    if (BI->getIntrinsicInfo().ID != llvm::Intrinsic::not_intrinsic) {
       verifyLLVMIntrinsic(BI, BI->getIntrinsicInfo().ID);
+      return;
+    }
+
+    // At this point, we know that we have a Builtin that is a Swift Builtin
+    // rather than an llvm intrinsic. Make sure our name corresponds to an
+    // actual ValueDecl. Otherwise, we have an invalid builtin.
+    require(getBuiltinValueDecl(BI->getModule().getASTContext(), BI->getName()),
+            "Invalid builtin name?!");
   }
 
   void checkFunctionRefBaseInst(FunctionRefBaseInst *FRI) {