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
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
|
From 3e1f5a1ec1365fafae965c97603221c9ccbc2d61 Mon Sep 17 00:00:00 2001
From: Yang Chen <chenyang@cs.utah.edu>
Date: Tue, 13 Oct 2020 00:49:53 -0700
Subject: [PATCH] Make it compile with LLVM11
Applied the patch provided by Vegard Nossum (vegard@github).
---
clang_delta/CommonRenameClassRewriteVisitor.h | 4 ++--
clang_delta/RemoveNamespace.cpp | 2 +-
clang_delta/RewriteUtils.cpp | 2 +-
clang_delta/Transformation.cpp | 2 +-
clang_delta/TransformationManager.cpp | 18 ++++++++++--------
5 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/clang_delta/CommonRenameClassRewriteVisitor.h b/clang_delta/CommonRenameClassRewriteVisitor.h
index e400f3f..ba860d9 100644
--- a/clang_delta/CommonRenameClassRewriteVisitor.h
+++ b/clang_delta/CommonRenameClassRewriteVisitor.h
@@ -98,7 +98,7 @@ bool CommonRenameClassRewriteVisitor<T>::VisitUsingDecl(UsingDecl *D)
return true;
IdentifierInfo *IdInfo = DeclName.getAsIdentifierInfo();
- std::string IdName = IdInfo->getName();
+ std::string IdName = IdInfo->getName().str();
std::string Name;
if (getNewNameByName(IdName, Name)) {
SourceLocation LocStart = NameInfo.getBeginLoc();
@@ -337,7 +337,7 @@ template<typename T> bool CommonRenameClassRewriteVisitor<T>::
TransAssert(DTST && "Bad DependentTemplateSpecializationType!");
const IdentifierInfo *IdInfo = DTST->getIdentifier();
- std::string IdName = IdInfo->getName();
+ std::string IdName = IdInfo->getName().str();
std::string Name;
if (getNewNameByName(IdName, Name)) {
SourceLocation LocStart = DTSLoc.getTemplateNameLoc();
diff --git a/clang_delta/RemoveNamespace.cpp b/clang_delta/RemoveNamespace.cpp
index 71ea571..867e9c0 100644
--- a/clang_delta/RemoveNamespace.cpp
+++ b/clang_delta/RemoveNamespace.cpp
@@ -458,7 +458,7 @@ bool RemoveNamespaceRewriteVisitor::VisitDependentTemplateSpecializationTypeLoc(
TransAssert(DTST && "Bad DependentTemplateSpecializationType!");
const IdentifierInfo *IdInfo = DTST->getIdentifier();
- std::string IdName = IdInfo->getName();
+ std::string IdName = IdInfo->getName().str();
std::string Name;
// FIXME:
diff --git a/clang_delta/RewriteUtils.cpp b/clang_delta/RewriteUtils.cpp
index 71e9914..8c185aa 100644
--- a/clang_delta/RewriteUtils.cpp
+++ b/clang_delta/RewriteUtils.cpp
@@ -748,7 +748,7 @@ std::string RewriteUtils::getStmtIndentString(Stmt *S,
++I;
indentSpace = MB.substr(lineOffs, I-lineOffs);
- return indentSpace;
+ return indentSpace.str();
}
bool RewriteUtils::addLocalVarToFunc(const std::string &VarStr,
diff --git a/clang_delta/Transformation.cpp b/clang_delta/Transformation.cpp
index 9ef79cc..41153f3 100644
--- a/clang_delta/Transformation.cpp
+++ b/clang_delta/Transformation.cpp
@@ -357,7 +357,7 @@ unsigned int Transformation::getConstArraySize(
llvm::SmallString<8> IntStr;
Result.toStringUnsigned(IntStr);
- std::stringstream TmpSS(IntStr.str());
+ std::stringstream TmpSS(IntStr.str().str());
if (!(TmpSS >> Sz)) {
TransAssert(0 && "Non-integer value!");
diff --git a/clang_delta/TransformationManager.cpp b/clang_delta/TransformationManager.cpp
index b123632..98fc67e 100644
--- a/clang_delta/TransformationManager.cpp
+++ b/clang_delta/TransformationManager.cpp
@@ -16,7 +16,9 @@
#include <sstream>
+#include "clang/Basic/Builtins.h"
#include "clang/Basic/Diagnostic.h"
+#include "clang/Basic/FileManager.h"
#include "clang/Basic/TargetInfo.h"
#include "clang/Lex/Preprocessor.h"
#include "clang/Frontend/CompilerInstance.h"
@@ -101,16 +103,16 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
CompilerInvocation &Invocation = ClangInstance->getInvocation();
InputKind IK = FrontendOptions::getInputKindForExtension(
StringRef(SrcFileName).rsplit('.').second);
- if (IK.getLanguage() == InputKind::C) {
- Invocation.setLangDefaults(ClangInstance->getLangOpts(), InputKind::C, T, PPOpts);
+ if (IK.getLanguage() == Language::C) {
+ Invocation.setLangDefaults(ClangInstance->getLangOpts(), Language::C, T, PPOpts);
}
- else if (IK.getLanguage() == InputKind::CXX) {
+ else if (IK.getLanguage() == Language::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(), InputKind::CXX, T, PPOpts);
+ Invocation.setLangDefaults(ClangInstance->getLangOpts(), Language::CXX, T, PPOpts);
}
- else if(IK.getLanguage() == InputKind::OpenCL) {
+ else if(IK.getLanguage() == Language::OpenCL) {
//Commandline parameters
std::vector<const char*> Args;
Args.push_back("-x");
@@ -122,7 +124,7 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
ClangInstance->createFileManager();
if(CLCPath != NULL && ClangInstance->hasFileManager() &&
- ClangInstance->getFileManager().getDirectory(CLCPath, false) != NULL) {
+ ClangInstance->getFileManager().getDirectory(CLCPath, false)) {
Args.push_back("-I");
Args.push_back(CLCPath);
}
@@ -132,10 +134,10 @@ bool TransformationManager::initializeCompilerInstance(std::string &ErrorMsg)
Args.push_back("-fno-builtin");
CompilerInvocation::CreateFromArgs(Invocation,
- &Args[0], &Args[0] + Args.size(),
+ ArrayRef<const char*>(&Args[0], &Args[0] + Args.size()),
ClangInstance->getDiagnostics());
Invocation.setLangDefaults(ClangInstance->getLangOpts(),
- InputKind::OpenCL, T, PPOpts);
+ Language::OpenCL, T, PPOpts);
}
else {
ErrorMsg = "Unsupported file type!";
--
2.29.2
|