Browse Source

Updated to LLVM/Clang revisions 348759/348755 respectively.

This fixes the parsing of the headers for MinGW 7.3.0 64-bit.

Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
pull/1146/head
Dimitar Dobrev 7 years ago
parent
commit
1356b9755d
  1. 2
      build/Clang-commit
  2. 2
      build/LLVM-commit
  3. 2
      src/CppParser/ELFDumper.h
  4. 4
      src/CppParser/Parser.cpp

2
build/Clang-commit

@ -1 +1 @@
bbae650adb7a55c54b95efbb1b52c35101f3703c 9db90514610de6a64b71f9fa7f115437aa3d83d3

2
build/LLVM-commit

@ -1 +1 @@
bfd4fdf0e5ff0908e3c5274e7879589ccb1a65fe 981341ad1ab30b1d90c4673f5b886232f6ba5d3d

2
src/CppParser/ELFDumper.h

@ -103,7 +103,7 @@ ELFDumper<ELFT>::ELFDumper(const llvm::object::ELFFile<ELFT> *Obj) {
} }
} }
if (StringTableBegin) if (StringTableBegin)
DynamicStringTable = StringRef(StringTableBegin, StringTableSize); DynamicStringTable = llvm::StringRef(StringTableBegin, StringTableSize);
} }
template <typename ELFT> template <typename ELFT>

4
src/CppParser/Parser.cpp

@ -3573,13 +3573,13 @@ AST::Expression* Parser::WalkExpression(const clang::Expr* Expr)
default: default:
break; break;
} }
llvm::APSInt integer; clang::Expr::EvalResult integer;
if (Expr->getStmtClass() != Stmt::CharacterLiteralClass && if (Expr->getStmtClass() != Stmt::CharacterLiteralClass &&
Expr->getStmtClass() != Stmt::CXXBoolLiteralExprClass && Expr->getStmtClass() != Stmt::CXXBoolLiteralExprClass &&
Expr->getStmtClass() != Stmt::UnaryExprOrTypeTraitExprClass && Expr->getStmtClass() != Stmt::UnaryExprOrTypeTraitExprClass &&
!Expr->isValueDependent() && !Expr->isValueDependent() &&
Expr->EvaluateAsInt(integer, c->getASTContext())) Expr->EvaluateAsInt(integer, c->getASTContext()))
return new AST::Expression(integer.toString(10)); return new AST::Expression(integer.Val.getInt().toString(10));
return new AST::Expression(GetStringFromStatement(Expr)); return new AST::Expression(GetStringFromStatement(Expr));
} }

Loading…
Cancel
Save