diff options
| author | Fariborz Jahanian <fjahanian@apple.com> | 2010-11-09 21:38:20 +0000 |
|---|---|---|
| committer | Fariborz Jahanian <fjahanian@apple.com> | 2010-11-09 21:38:20 +0000 |
| commit | ba8bda05fefd3bb2f1ef201784b685f715bdde29 (patch) | |
| tree | 181f5d6965e2d819ba94be9cbe32ac3436f8b622 /lib/Sema/SemaLookup.cpp | |
| parent | 7ad5d421d9f12bd287aa17fdb00e0f4d5971d76f (diff) | |
Restore patch reversed in r118475. Fixes
// rdar://8632525
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@118634 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Sema/SemaLookup.cpp')
| -rw-r--r-- | lib/Sema/SemaLookup.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/Sema/SemaLookup.cpp b/lib/Sema/SemaLookup.cpp index 65e8659f5f..29b45df63b 100644 --- a/lib/Sema/SemaLookup.cpp +++ b/lib/Sema/SemaLookup.cpp @@ -484,6 +484,11 @@ static bool LookupBuiltin(Sema &S, LookupResult &R) { if (S.getLangOptions().CPlusPlus && S.Context.BuiltinInfo.isPredefinedLibFunction(BuiltinID)) return false; + // 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 (!S.getLangOptions().ObjC1 && + S.Context.BuiltinInfo.GetTypeString(BuiltinID)[0] == 'G') + return false; NamedDecl *D = S.LazilyCreateBuiltin((IdentifierInfo *)II, BuiltinID, S.TUScope, R.isForRedeclaration(), |