commit 7982a648d05fabf2d5aa08341e8f9b348d0296b6
author Steve Naroff <snaroff@apple.com> Mon Jul 13 17:19:15 2009 +0000
committer Steve Naroff <snaroff@apple.com> Mon Jul 13 17:19:15 2009 +0000
tree 24e5ccd61fb519d48e10ea7561f1718039a0383c
parent 6d8dffa14a103a9e6e1f5d664a6b234426143cff

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

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

lib/Sema/SemaExpr.cpp

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index 058bda4..d2f3f35 100644
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -2226,7 +2226,7 @@
   }
 
   // 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 @@
   // 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 @@
           << 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;