Fixing a warning that causes the sanitizer build disliked about mixing && and ||...

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

diff --git a/utils/TableGen/ClangAttrEmitter.cpp b/utils/TableGen/ClangAttrEmitter.cpp
index 672589c0b4801c35e5abe638ab85bcebc46cefa0..7ac14ba915b6af7d70b00b38405b04c35437cdfb 100644 (file)
--- a/utils/TableGen/ClangAttrEmitter.cpp
+++ b/utils/TableGen/ClangAttrEmitter.cpp
@@ -2088,10 +2088,11 @@ static std::string GenerateCustomAppertainsTo(const Record &Subject,
   }
 
   OS << "static bool " << FnName << "(const Decl *D) {\n";
-  OS << "  const " << GetSubjectWithSuffix(Base) << " *S = dyn_cast<";
+  OS << "  if (const " << GetSubjectWithSuffix(Base) << " *S = dyn_cast<";
   OS << GetSubjectWithSuffix(Base);
-  OS << ">(D);\n";
-  OS << "  return S && " << Subject.getValueAsString("CheckCode") << ";\n";
+  OS << ">(D))\n";
+  OS << "    return " << Subject.getValueAsString("CheckCode") << ";\n";
+  OS << "  return false;\n";
   OS << "}\n\n";
 
   CustomSubjectSet.insert(FnName);