Fix 5 issues from Chris's feedback on http://llvm.org/viewvc/llvm-project?view=rev...

Still more to come...just wanted to get the no-brainers out of the way.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@75477 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CodeGenTypes.cpp b/lib/CodeGen/CodeGenTypes.cpp
index a83c72f2b84cfd48372ac9d7a41a971cf626a55b..6add2c25c7c99bd55bf8e4262060bcd3e331b155 100644 (file)
--- a/lib/CodeGen/CodeGenTypes.cpp
+++ b/lib/CodeGen/CodeGenTypes.cpp
@@ -215,7 +215,6 @@ static const llvm::Type* getTypeForFormat(const llvm::fltSemantics &format) {
 const llvm::Type *CodeGenTypes::ConvertNewType(QualType T) {
   const clang::Type &Ty = *Context.getCanonicalType(T);
   
-  //T->dump();
   switch (Ty.getTypeClass()) {
 #define TYPE(Class, Base)
 #define ABSTRACT_TYPE(Class, Base)

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 9c3ef2f6da2596d6dd971a806c90d2b0f07d5b47..baa2a2b9abb0c951c00f4480166d88ad2b405a69 100644 (file)
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -528,7 +528,6 @@ void Sema::MergeTypeDefDecl(TypedefDecl *New, Decl *OldD) {
       // Install the built-in type for 'id', ignoring the current definition.
       New->setTypeForDecl(Context.getObjCIdType().getTypePtr());
       return;
-      break;
     case 5:
       if (!TypeID->isStr("Class"))
         break;

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 058bda4d10a8c5d9aebae67e188b43be0bfc1a6d..d2f3f352c12e6b753e785e2ccea4f900574505e0 100644 (file)
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -2226,7 +2226,7 @@ Sema::ActOnMemberReferenceExpr(Scope *S, ExprArg Base, SourceLocation OpLoc,
   }
 
   // Handle properties on ObjC 'Class' types.
-  if (OpKind == tok::period && (BaseType->isObjCClassType())) {
+  if (OpKind == tok::period && BaseType->isObjCClassType()) {
     // Also must look for a getter name which uses property syntax.
     Selector Sel = PP.getSelectorTable().getNullarySelector(&Member);
     if (ObjCMethodDecl *MD = getCurMethodDecl()) {
@@ -3917,12 +3917,7 @@ QualType Sema::CheckSubtractionOperands(Expr *&lex, Expr *&rex,
   // Either ptr - int   or   ptr - ptr.
   if (lex->getType()->isPointerType() || 
       lex->getType()->isObjCObjectPointerType()) {
-    QualType lpointee;
-    if (const PointerType *LHSPTy = lex->getType()->getAsPointerType())
-      lpointee = LHSPTy->getPointeeType();
-    else if (const ObjCObjectPointerType *OPT = 
-              lex->getType()->getAsObjCObjectPointerType())
-      lpointee = OPT->getPointeeType();
+    QualType lpointee = lex->getType()->getPointeeType();
 
     // The LHS must be an completely-defined object type.
 
@@ -4295,15 +4290,11 @@ QualType Sema::CheckCompareOperands(Expr *&lex, Expr *&rex, SourceLocation Loc,
           << lType << rType << lex->getSourceRange() << rex->getSourceRange();
       }
       if (lType->isObjCQualifiedIdType() && rType->isObjCQualifiedIdType()) {
-        if (ObjCQualifiedIdTypesAreCompatible(lType, rType, true)) {
-          ImpCastExprToType(rex, lType);
-          return ResultTy;
-        } else {
+        if (!ObjCQualifiedIdTypesAreCompatible(lType, rType, true))
           Diag(Loc, diag::warn_incompatible_qualified_id_operands)
             << lType << rType << lex->getSourceRange() << rex->getSourceRange();
-          ImpCastExprToType(rex, lType);
-          return ResultTy;
-        }
+        ImpCastExprToType(rex, lType);
+        return ResultTy;
       }
       ImpCastExprToType(rex, lType);
       return ResultTy;

diff --git a/lib/Sema/SemaExprObjC.cpp b/lib/Sema/SemaExprObjC.cpp
index cca4ce355153934d6d8330e2764edf6e95276741..1131a9f0d846a69168bd5b8508e41367aad267fc 100644 (file)
--- a/lib/Sema/SemaExprObjC.cpp
+++ b/lib/Sema/SemaExprObjC.cpp
@@ -765,7 +765,6 @@ bool Sema::ObjCQualifiedIdTypesAreCompatible(QualType lhs, QualType rhs,
           if (!ClassImplementsProtocol(*I, rhsID, true))
             return false;
         }
-        return true;
       }
       // If there are no qualifiers and no interface, we have an 'id'.
       return true;