summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Lorenz <arphaman@gmail.com>2017-04-18 10:17:41 +0000
committerAlex Lorenz <arphaman@gmail.com>2017-04-18 10:17:41 +0000
commitdf381a38cfc0018e459897639364fcfe7adf7d11 (patch)
tree078643eb35f59162e913d0fc8a3e863a904c58ba
parent4163ed68e2dd54a6654802a8a5a0dadb3bc6f69f (diff)
Fix one more 'not all control paths return a value' MSVC warning
The warning was caused by r300539. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@300542 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/Parse/ParsePragma.cpp2
-rw-r--r--utils/TableGen/ClangAttrEmitter.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/Parse/ParsePragma.cpp b/lib/Parse/ParsePragma.cpp
index aa915fa3ba..abddb6ba67 100644
--- a/lib/Parse/ParsePragma.cpp
+++ b/lib/Parse/ParsePragma.cpp
@@ -1014,6 +1014,8 @@ static bool isAbstractAttrMatcherRule(attr::SubjectMatchRule Rule) {
return IsAbstract;
#include "clang/Basic/AttrSubMatchRulesList.inc"
}
+ llvm_unreachable("Invalid attribute subject match rule");
+ return false;
}
static void diagnoseExpectedAttributeSubjectSubRule(
diff --git a/utils/TableGen/ClangAttrEmitter.cpp b/utils/TableGen/ClangAttrEmitter.cpp
index 7aa8bdc781..65dbccde62 100644
--- a/utils/TableGen/ClangAttrEmitter.cpp
+++ b/utils/TableGen/ClangAttrEmitter.cpp
@@ -3168,7 +3168,7 @@ emitAttributeMatchRules(PragmaClangAttributeSupport &PragmaAttributeSupport,
OS << ";\n";
}
OS << " }\n";
- OS << " llvm_unreachable(\"Invalid match rule\");\n";
+ OS << " llvm_unreachable(\"Invalid match rule\");\nreturn false;\n";
OS << "}\n\n";
}