diff --git a/build/Clang-commit b/build/Clang-commit
index 8850a87b..dae194cb 100644
--- a/build/Clang-commit
+++ b/build/Clang-commit
@@ -1 +1 @@
-bbae650adb7a55c54b95efbb1b52c35101f3703c
\ No newline at end of file
+9db90514610de6a64b71f9fa7f115437aa3d83d3
\ No newline at end of file
diff --git a/build/LLVM-commit b/build/LLVM-commit
index f3ca6fcf..396cbca8 100644
--- a/build/LLVM-commit
+++ b/build/LLVM-commit
@@ -1 +1 @@
-bfd4fdf0e5ff0908e3c5274e7879589ccb1a65fe
\ No newline at end of file
+981341ad1ab30b1d90c4673f5b886232f6ba5d3d
\ No newline at end of file
diff --git a/src/CppParser/ELFDumper.h b/src/CppParser/ELFDumper.h
index 7cf176ff..599e5f0f 100644
--- a/src/CppParser/ELFDumper.h
+++ b/src/CppParser/ELFDumper.h
@@ -103,7 +103,7 @@ ELFDumper<ELFT>::ELFDumper(const llvm::object::ELFFile<ELFT> *Obj) {
         }
     }
     if (StringTableBegin)
-        DynamicStringTable = StringRef(StringTableBegin, StringTableSize);
+        DynamicStringTable = llvm::StringRef(StringTableBegin, StringTableSize);
 }
 
 template <typename ELFT>
diff --git a/src/CppParser/Parser.cpp b/src/CppParser/Parser.cpp
index aad96976..e84fb8af 100644
--- a/src/CppParser/Parser.cpp
+++ b/src/CppParser/Parser.cpp
@@ -3573,13 +3573,13 @@ AST::Expression* Parser::WalkExpression(const clang::Expr* Expr)
     default:
         break;
     }
-    llvm::APSInt integer;
+    clang::Expr::EvalResult integer;
     if (Expr->getStmtClass() != Stmt::CharacterLiteralClass &&
         Expr->getStmtClass() != Stmt::CXXBoolLiteralExprClass &&
         Expr->getStmtClass() != Stmt::UnaryExprOrTypeTraitExprClass &&
         !Expr->isValueDependent() &&
         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));
 }