From: Reid Kleckner <rnk@google.com>
Date: Thu, 31 Oct 2019 21:18:38 +0000 (-0700)
Subject: Remove unneeded template alias, causes issues with some MSVC version
X-Git-Tag: llvmorg-11-init~5309
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=19f1dc7b527eade11dae9425c420cc9f450393b6;p=platform%2Fupstream%2Fllvm.git

Remove unneeded template alias, causes issues with some MSVC version

I built locally with the latest MSVC in c++14 and c++17, but it does not
complain for me. Osman Zakir on llvm-dev reports that they run into
compile errors here.

In any case, it seems prefereable to reuse clang's LLVM.h header to
bring in llvm::Optional and Expected.
---

diff --git a/clang/lib/AST/Interp/ByteCodeStmtGen.cpp b/clang/lib/AST/Interp/ByteCodeStmtGen.cpp
index c713015..5b47489 100644
--- a/clang/lib/AST/Interp/ByteCodeStmtGen.cpp
+++ b/clang/lib/AST/Interp/ByteCodeStmtGen.cpp
@@ -14,13 +14,11 @@
 #include "PrimType.h"
 #include "Program.h"
 #include "State.h"
+#include "clang/Basic/LLVM.h"
 
 using namespace clang;
 using namespace clang::interp;
 
-template <typename T> using Expected = llvm::Expected<T>;
-template <typename T> using Optional = llvm::Optional<T>;
-
 namespace clang {
 namespace interp {