diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/Driver/RewriteTest.cpp | 17 | ||||
| -rw-r--r-- | clang/Lex/Preprocessor.cpp | 1 |
2 files changed, 12 insertions, 6 deletions
diff --git a/clang/Driver/RewriteTest.cpp b/clang/Driver/RewriteTest.cpp index 788b5226128..6a5bb0fc3a4 100644 --- a/clang/Driver/RewriteTest.cpp +++ b/clang/Driver/RewriteTest.cpp @@ -406,22 +406,28 @@ CallExpr *RewriteTest::SynthesizeCallToFunctionDecl( bool RewriteTest::functionReferencesAnyObjcQualifiedInterfaceTypes( const FunctionTypeProto *proto) { - const PointerType *pType = proto->getResultType()->getAsPointerType(); - if (pType) { + QualType resultType = proto->getResultType(); + + if (resultType == Context->getObjcIdType()) { + // FIXME: we don't currently represent "id <Protocol>" in the type system. + // Implement a heuristic here (until we do). + } else if (const PointerType *pType = resultType->getAsPointerType()) { Type *pointeeType = pType->getPointeeType().getTypePtr(); if (isa<ObjcQualifiedInterfaceType>(pointeeType)) return true; // we have "Class <Protocol> *". } // Now check arguments. for (unsigned i = 0; i < proto->getNumArgs(); i++) { - pType = proto->getArgType(i)->getAsPointerType(); - if (pType) { + QualType argType = proto->getArgType(i); + if (argType == Context->getObjcIdType()) { + // FIXME: we don't currently represent "id <Protocol>" in the type system. + // Implement a heuristic here (until we do). + } else if (const PointerType *pType = argType->getAsPointerType()) { Type *pointeeType = pType->getPointeeType().getTypePtr(); if (isa<ObjcQualifiedInterfaceType>(pointeeType)) return true; } } - // FIXME: we don't currently represent "id <Protocol>" in the type system. return false; } @@ -431,6 +437,7 @@ void RewriteTest::RewriteFunctionDecl(FunctionDecl *FD) { SelGetUidFunctionDecl = FD; return; } + return; // FIXME: remove when the code below is ready. // Check for ObjC 'id' and class types that have been adorned with protocol // information (id<p>, C<p>*). The protocol references need to be rewritten! const FunctionType *funcType = FD->getType()->getAsFunctionType(); diff --git a/clang/Lex/Preprocessor.cpp b/clang/Lex/Preprocessor.cpp index 04b2a80f02b..c1f4970f30d 100644 --- a/clang/Lex/Preprocessor.cpp +++ b/clang/Lex/Preprocessor.cpp @@ -369,7 +369,6 @@ static void InitializePredefinedMacros(Preprocessor &PP, DefineBuiltinMacro(Buf, "__OBJC__=1"); if (PP.getLangOptions().ObjC2) DefineBuiltinMacro(Buf, "__OBJC2__=1"); - if (PP.getLangOptions().ObjC1) { const char *ObjcType; // Predefine all the ObjC goodies (traditionally declared in <objc/objc.h>). |
