1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
|
From 97e2b29956adbe61973228ef7d8bff28e83d04d4 Mon Sep 17 00:00:00 2001
From: Yang Chen <chenyang@cs.utah.edu>
Date: Thu, 27 Apr 2017 20:55:32 -0700
Subject: [PATCH] Fix build failure with LLVM trunk
Patch provided by Markus Trippelsdorf. Thanks!
"InputKind was refactored in Clang r301442.
The IK_Preprocessed* comparisons are superfluous now and can be dropped."
---
clang_delta/TransformationManager.cpp | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/clang_delta/TransformationManager.cpp b/clang_delta/TransformationManager.cpp
index 8b6bdf454847..5db190cd71d1 100644
--- a/clang_delta/TransformationManager.cpp
+++ b/clang_delta/TransformationManager.cpp
@@ -101,16 +101,16 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
CompilerInvocation &Invocation = ClangInstance->getInvocation();
InputKind IK = FrontendOptions::getInputKindForExtension(
StringRef(SrcFileName).rsplit('.').second);
- if ((IK == IK_C) || (IK == IK_PreprocessedC)) {
- Invocation.setLangDefaults(ClangInstance->getLangOpts(), IK_C, T, PPOpts);
+ if (IK.getLanguage() == InputKind::C) {
+ Invocation.setLangDefaults(ClangInstance->getLangOpts(), InputKind::C, T, PPOpts);
}
- else if ((IK == IK_CXX) || (IK == IK_PreprocessedCXX)) {
+ else if (IK.getLanguage() == InputKind::CXX) {
// ISSUE: it might cause some problems when building AST
- // for a function which has a non-declared callee, e.g.,
- // It results an empty AST for the caller.
- Invocation.setLangDefaults(ClangInstance->getLangOpts(), IK_CXX, T, PPOpts);
+ // for a function which has a non-declared callee, e.g.,
+ // It results an empty AST for the caller.
+ Invocation.setLangDefaults(ClangInstance->getLangOpts(), InputKind::CXX, T, PPOpts);
}
- else if(IK == IK_OpenCL) {
+ else if(IK.getLanguage() == InputKind::OpenCL) {
//Commandline parameters
std::vector<const char*> Args;
Args.push_back("-x");
@@ -135,7 +135,7 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
&Args[0], &Args[0] + Args.size(),
ClangInstance->getDiagnostics());
Invocation.setLangDefaults(ClangInstance->getLangOpts(),
- IK_OpenCL, T, PPOpts);
+ InputKind::OpenCL, T, PPOpts);
}
else {
ErrorMsg = "Unsupported file type!";
--
2.15.1
|
