1 files changed, 7 insertions, 2 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index b70486a1b8..bc811d0e77 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -4295,8 +4295,13 @@ Sema::BuildResolvedCallExpr(Expr *Fn, NamedDecl *NDecl,
     if (CheckFunctionCall(FDecl, TheCall))
       return ExprError();
 
-    if (unsigned BuiltinID = FDecl->getBuiltinID())
-      return CheckBuiltinFunctionCall(BuiltinID, TheCall);
+    if (unsigned BuiltinID = FDecl->getBuiltinID()) {
+      // When not in Objective-C mode, there is no builtin 'id' type.
+      // We won't have pre-defined library functions which use this type.
+      if (getLangOptions().ObjC1 ||
+          Context.BuiltinInfo.GetTypeString(BuiltinID)[0] != 'G')
+        return CheckBuiltinFunctionCall(BuiltinID, TheCall);
+    }
   } else if (NDecl) {
     if (CheckBlockCall(NDecl, TheCall))
       return ExprError();