Skip to content

Commit c579b65

Browse files
ddobrevtritao
ddobrev
authored and
tritao
committed
Update LLVM/Clang
Signed-off-by: Dimitar Dobrev <[email protected]>
1 parent fe4d247 commit c579b65

File tree

6 files changed

+125
-110
lines changed

6 files changed

+125
-110
lines changed

‎build/Clang-commit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
9db90514610de6a64b71f9fa7f115437aa3d83d3
1+
173708d165c6145075ef941e6953f2c1c1167544

‎build/LLVM-commit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
981341ad1ab30b1d90c4673f5b886232f6ba5d3d
1+
815d4b098ce998dfa0aa08064cadbb2718e48b7d

‎build/LLVM.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,6 @@ function SetupLLVMLibs()
156156
"LLVMMCParser",
157157
"LLVMBitReader",
158158
"LLVMX86Info",
159-
"LLVMX86AsmPrinter",
160159
"LLVMX86Utils",
161160
"LLVMX86CodeGen",
162161
"LLVMX86Disassembler",
@@ -175,7 +174,8 @@ function SetupLLVMLibs()
175174
"LLVMCore",
176175
"LLVMSupport",
177176
"LLVMBinaryFormat",
178-
"LLVMDemangle"
177+
"LLVMDemangle",
178+
"LLVMRemarks"
179179
}
180180

181181
filter(c)

‎src/CppParser/ParseExpr.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -1850,7 +1850,7 @@ AST::Expr* Parser::WalkExpression(const clang::Expr* Expr)
18501850
_S->operatorDelete = static_cast<AST::Function*>(WalkDeclaration(S->getOperatorDelete()));
18511851
_S->allocatedType = GetQualifiedType(S->getAllocatedType());
18521852
_S->isArray = S->isArray();
1853-
_S->arraySize = static_cast<AST::Expr*>(WalkExpression(S->getArraySize()));
1853+
_S->arraySize = static_cast<AST::Expr*>(WalkExpression(S->getArraySize().getValue()));
18541854
_S->numPlacementArgs = S->getNumPlacementArgs();
18551855
_S->isParenTypeId = S->isParenTypeId();
18561856
_S->isGlobalNew = S->isGlobalNew();

‎src/CppParser/Parser.cpp

+9-3
Original file line numberDiff line numberDiff line change
@@ -2810,6 +2810,12 @@ Type* Parser::WalkType(clang::QualType QualType, const clang::TypeLoc* TL,
28102810
Ty = WalkType(DT->getUnderlyingType(), TL);
28112811
break;
28122812
}
2813+
case clang::Type::MacroQualified:
2814+
{
2815+
auto MT = Type->getAs<clang::MacroQualifiedType>();
2816+
Ty = WalkType(MT->getUnderlyingType(), TL);
2817+
break;
2818+
}
28132819
default:
28142820
{
28152821
Debug("Unhandled type class '%s'\n", Type->getTypeClassName());
@@ -2919,9 +2925,9 @@ static const clang::CodeGen::CGFunctionInfo& GetCodeGenFunctionInfo(
29192925
{
29202926
using namespace clang;
29212927
if (auto CD = dyn_cast<clang::CXXConstructorDecl>(FD)) {
2922-
return CodeGenTypes->arrangeCXXStructorDeclaration(CD, clang::CodeGen::StructorType::Base);
2928+
return CodeGenTypes->arrangeCXXStructorDeclaration(CD);
29232929
} else if (auto DD = dyn_cast<clang::CXXDestructorDecl>(FD)) {
2924-
return CodeGenTypes->arrangeCXXStructorDeclaration(DD, clang::CodeGen::StructorType::Base);
2930+
return CodeGenTypes->arrangeCXXStructorDeclaration(DD);
29252931
}
29262932

29272933
return CodeGenTypes->arrangeFunctionDeclaration(FD);
@@ -4163,7 +4169,7 @@ bool Parser::SetupSourceFiles(const std::vector<std::string>& SourceFiles,
41634169
{
41644170
auto FileEntry = c->getPreprocessor().getHeaderSearchInfo().LookupFile(SourceFile,
41654171
clang::SourceLocation(), /*isAngled*/true,
4166-
nullptr, Dir, Includers, nullptr, nullptr, nullptr, nullptr, nullptr);
4172+
nullptr, Dir, Includers, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr);
41674173

41684174
if (!FileEntry)
41694175
return false;

‎src/Generator.Tests/ReadNativeSymbolsTest.cs

+111-102
Original file line numberDiff line numberDiff line change
@@ -100,108 +100,117 @@ public void TestReadSymbolsWindows()
100100
public void TestReadSymbolsLinux()
101101
{
102102
var symbols = GetSymbols("libexpat-linux");
103-
Assert.AreEqual("free", symbols[0]);
104-
Assert.AreEqual("_ITM_deregisterTMCloneTable", symbols[1]);
105-
Assert.AreEqual("getpid", symbols[2]);
106-
Assert.AreEqual("__stack_chk_fail", symbols[3]);
107-
Assert.AreEqual("gettimeofday", symbols[4]);
108-
Assert.AreEqual("__assert_fail", symbols[5]);
109-
Assert.AreEqual("memset", symbols[6]);
110-
Assert.AreEqual("memcmp", symbols[7]);
111-
Assert.AreEqual("__gmon_start__", symbols[8]);
112-
Assert.AreEqual("memcpy", symbols[9]);
113-
Assert.AreEqual("malloc", symbols[10]);
114-
Assert.AreEqual("realloc", symbols[11]);
115-
Assert.AreEqual("memmove", symbols[12]);
116-
Assert.AreEqual("_Jv_RegisterClasses", symbols[13]);
117-
Assert.AreEqual("_ITM_registerTMCloneTable", symbols[14]);
118-
Assert.AreEqual("__cxa_finalize", symbols[15]);
119-
Assert.AreEqual("XmlInitUnknownEncoding", symbols[16]);
120-
Assert.AreEqual("XML_FreeContentModel", symbols[17]);
121-
Assert.AreEqual("XML_SetEndDoctypeDeclHandler", symbols[18]);
122-
Assert.AreEqual("XML_GetParsingStatus", symbols[19]);
123-
Assert.AreEqual("XmlGetUtf16InternalEncoding", symbols[20]);
124-
Assert.AreEqual("XML_MemRealloc", symbols[21]);
125-
Assert.AreEqual("XmlInitEncoding", symbols[22]);
126-
Assert.AreEqual("XML_ExpatVersion", symbols[23]);
127-
Assert.AreEqual("XML_SetHashSalt", symbols[24]);
128-
Assert.AreEqual("XML_SetStartDoctypeDeclHandler", symbols[25]);
129-
Assert.AreEqual("XML_ExternalEntityParserCreate", symbols[26]);
130-
Assert.AreEqual("XML_GetBuffer", symbols[27]);
131-
Assert.AreEqual("XML_GetCurrentColumnNumber", symbols[28]);
132-
Assert.AreEqual("XML_SetEndCdataSectionHandler", symbols[29]);
133-
Assert.AreEqual("XML_SetStartCdataSectionHandler", symbols[30]);
134-
Assert.AreEqual("XML_GetCurrentByteCount", symbols[31]);
135-
Assert.AreEqual("XML_DefaultCurrent", symbols[32]);
136-
Assert.AreEqual("XmlInitUnknownEncodingNS", symbols[33]);
137-
Assert.AreEqual("XML_ExpatVersionInfo", symbols[34]);
138-
Assert.AreEqual("XmlUtf16Encode", symbols[35]);
139-
Assert.AreEqual("XML_GetInputContext", symbols[36]);
140-
Assert.AreEqual("XML_SetExternalEntityRefHandler", symbols[37]);
141-
Assert.AreEqual("XML_GetSpecifiedAttributeCount", symbols[38]);
142-
Assert.AreEqual("XML_SetUserData", symbols[39]);
143-
Assert.AreEqual("XML_ErrorString", symbols[40]);
144-
Assert.AreEqual("XML_SetElementHandler", symbols[41]);
145-
Assert.AreEqual("XML_SetNamespaceDeclHandler", symbols[42]);
146-
Assert.AreEqual("_fini", symbols[43]);
147-
Assert.AreEqual("XmlSizeOfUnknownEncoding", symbols[44]);
148-
Assert.AreEqual("XML_GetIdAttributeIndex", symbols[45]);
149-
Assert.AreEqual("XML_SetAttlistDeclHandler", symbols[46]);
150-
Assert.AreEqual("XML_SetReturnNSTriplet", symbols[47]);
151-
Assert.AreEqual("XML_SetUnknownEncodingHandler", symbols[48]);
152-
Assert.AreEqual("XML_SetCdataSectionHandler", symbols[49]);
153-
Assert.AreEqual("XmlParseXmlDeclNS", symbols[50]);
154-
Assert.AreEqual("XML_SetDoctypeDeclHandler", symbols[51]);
155-
Assert.AreEqual("XML_SetDefaultHandler", symbols[52]);
156-
Assert.AreEqual("_init", symbols[53]);
157-
Assert.AreEqual("XmlPrologStateInitExternalEntity", symbols[54]);
158-
Assert.AreEqual("XML_SetCharacterDataHandler", symbols[55]);
159-
Assert.AreEqual("XML_ParserCreate", symbols[56]);
160-
Assert.AreEqual("XmlGetUtf8InternalEncodingNS", symbols[57]);
161-
Assert.AreEqual("XML_SetParamEntityParsing", symbols[58]);
162-
Assert.AreEqual("XML_MemFree", symbols[59]);
163-
Assert.AreEqual("XML_SetElementDeclHandler", symbols[60]);
164-
Assert.AreEqual("XML_MemMalloc", symbols[61]);
165-
Assert.AreEqual("XML_SetStartNamespaceDeclHandler", symbols[62]);
166-
Assert.AreEqual("XmlGetUtf16InternalEncodingNS", symbols[63]);
167-
Assert.AreEqual("XML_ParseBuffer", symbols[64]);
168-
Assert.AreEqual("XML_UseForeignDTD", symbols[65]);
169-
Assert.AreEqual("XML_SetEncoding", symbols[66]);
170-
Assert.AreEqual("XML_UseParserAsHandlerArg", symbols[67]);
171-
Assert.AreEqual("XML_SetEndNamespaceDeclHandler", symbols[68]);
172-
Assert.AreEqual("XML_SetEndElementHandler", symbols[69]);
173-
Assert.AreEqual("XML_GetCurrentLineNumber", symbols[70]);
174-
Assert.AreEqual("XML_SetXmlDeclHandler", symbols[71]);
175-
Assert.AreEqual("XML_SetProcessingInstructionHandler", symbols[72]);
176-
Assert.AreEqual("XmlUtf8Encode", symbols[73]);
177-
Assert.AreEqual("XML_SetStartElementHandler", symbols[74]);
178-
Assert.AreEqual("XML_SetSkippedEntityHandler", symbols[75]);
179-
Assert.AreEqual("XML_ResumeParser", symbols[76]);
180-
Assert.AreEqual("XML_SetEntityDeclHandler", symbols[77]);
181-
Assert.AreEqual("XML_ParserFree", symbols[78]);
182-
Assert.AreEqual("XML_SetNotStandaloneHandler", symbols[79]);
183-
Assert.AreEqual("XML_ParserCreate_MM", symbols[80]);
184-
Assert.AreEqual("XML_ParserCreateNS", symbols[81]);
185-
Assert.AreEqual("_edata", symbols[82]);
186-
Assert.AreEqual("XML_SetUnparsedEntityDeclHandler", symbols[83]);
187-
Assert.AreEqual("XML_SetBase", symbols[84]);
188-
Assert.AreEqual("XML_GetBase", symbols[85]);
189-
Assert.AreEqual("XmlGetUtf8InternalEncoding", symbols[86]);
190-
Assert.AreEqual("XML_SetExternalEntityRefHandlerArg", symbols[87]);
191-
Assert.AreEqual("XmlPrologStateInit", symbols[88]);
192-
Assert.AreEqual("_end", symbols[89]);
193-
Assert.AreEqual("XML_SetCommentHandler", symbols[90]);
194-
Assert.AreEqual("XmlParseXmlDecl", symbols[91]);
195-
Assert.AreEqual("XML_StopParser", symbols[92]);
196-
Assert.AreEqual("XML_GetErrorCode", symbols[93]);
197-
Assert.AreEqual("XML_GetFeatureList", symbols[94]);
198-
Assert.AreEqual("XML_SetDefaultHandlerExpand", symbols[95]);
199-
Assert.AreEqual("XML_Parse", symbols[96]);
200-
Assert.AreEqual("XmlInitEncodingNS", symbols[97]);
201-
Assert.AreEqual("XML_ParserReset", symbols[98]);
202-
Assert.AreEqual("XML_SetNotationDeclHandler", symbols[99]);
203-
Assert.AreEqual("__bss_start", symbols[100]);
204-
Assert.AreEqual("XML_GetCurrentByteIndex", symbols[101]);
103+
var expectedSymbols = new []
104+
{
105+
".init",
106+
"free",
107+
"_ITM_deregisterTMCloneTable",
108+
"getpid",
109+
"__stack_chk_fail",
110+
"gettimeofday",
111+
"__assert_fail",
112+
"memset",
113+
"memcmp",
114+
"__gmon_start__",
115+
"memcpy",
116+
"malloc",
117+
"realloc",
118+
"memmove",
119+
"_Jv_RegisterClasses",
120+
"_ITM_registerTMCloneTable",
121+
"__cxa_finalize",
122+
"XmlInitUnknownEncoding",
123+
"XML_FreeContentModel",
124+
"XML_SetEndDoctypeDeclHandler",
125+
"XML_GetParsingStatus",
126+
"XmlGetUtf16InternalEncoding",
127+
"XML_MemRealloc",
128+
"XmlInitEncoding",
129+
"XML_ExpatVersion",
130+
"XML_SetHashSalt",
131+
"XML_SetStartDoctypeDeclHandler",
132+
"XML_ExternalEntityParserCreate",
133+
"XML_GetBuffer",
134+
"XML_GetCurrentColumnNumber",
135+
"XML_SetEndCdataSectionHandler",
136+
"XML_SetStartCdataSectionHandler",
137+
"XML_GetCurrentByteCount",
138+
"XML_DefaultCurrent",
139+
"XmlInitUnknownEncodingNS",
140+
"XML_ExpatVersionInfo",
141+
"XmlUtf16Encode",
142+
"XML_GetInputContext",
143+
"XML_SetExternalEntityRefHandler",
144+
"XML_GetSpecifiedAttributeCount",
145+
"XML_SetUserData",
146+
"XML_ErrorString",
147+
"XML_SetElementHandler",
148+
"XML_SetNamespaceDeclHandler",
149+
"_fini",
150+
"XmlSizeOfUnknownEncoding",
151+
"XML_GetIdAttributeIndex",
152+
"XML_SetAttlistDeclHandler",
153+
"XML_SetReturnNSTriplet",
154+
"XML_SetUnknownEncodingHandler",
155+
"XML_SetCdataSectionHandler",
156+
"XmlParseXmlDeclNS",
157+
"XML_SetDoctypeDeclHandler",
158+
"XML_SetDefaultHandler",
159+
"_init",
160+
"XmlPrologStateInitExternalEntity",
161+
"XML_SetCharacterDataHandler",
162+
"XML_ParserCreate",
163+
"XmlGetUtf8InternalEncodingNS",
164+
"XML_SetParamEntityParsing",
165+
"XML_MemFree",
166+
"XML_SetElementDeclHandler",
167+
"XML_MemMalloc",
168+
"XML_SetStartNamespaceDeclHandler",
169+
"XmlGetUtf16InternalEncodingNS",
170+
"XML_ParseBuffer",
171+
"XML_UseForeignDTD",
172+
"XML_SetEncoding",
173+
"XML_UseParserAsHandlerArg",
174+
"XML_SetEndNamespaceDeclHandler",
175+
"XML_SetEndElementHandler",
176+
"XML_GetCurrentLineNumber",
177+
"XML_SetXmlDeclHandler",
178+
"XML_SetProcessingInstructionHandler",
179+
"XmlUtf8Encode",
180+
"XML_SetStartElementHandler",
181+
"XML_SetSkippedEntityHandler",
182+
"XML_ResumeParser",
183+
"XML_SetEntityDeclHandler",
184+
"XML_ParserFree",
185+
"XML_SetNotStandaloneHandler",
186+
"XML_ParserCreate_MM",
187+
"XML_ParserCreateNS",
188+
"_edata",
189+
"XML_SetUnparsedEntityDeclHandler",
190+
"XML_SetBase",
191+
"XML_GetBase",
192+
"XmlGetUtf8InternalEncoding",
193+
"XML_SetExternalEntityRefHandlerArg",
194+
"XmlPrologStateInit",
195+
"_end",
196+
"XML_SetCommentHandler",
197+
"XmlParseXmlDecl",
198+
"XML_StopParser",
199+
"XML_GetErrorCode",
200+
"XML_GetFeatureList",
201+
"XML_SetDefaultHandlerExpand",
202+
"XML_Parse",
203+
"XmlInitEncodingNS",
204+
"XML_ParserReset",
205+
"XML_SetNotationDeclHandler",
206+
"__bss_start",
207+
"XML_GetCurrentByteIndex"
208+
};
209+
210+
for (int i = 0; i < symbols.Count; i++)
211+
{
212+
Assert.That(symbols[i], Is.EqualTo(expectedSymbols[i]));
213+
}
205214
}
206215

207216
[Test]

0 commit comments

Comments
 (0)