Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: emscripten-core/emscripten-fastcomp-clang
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.35.20
Choose a base ref
...
head repository: emscripten-core/emscripten-fastcomp-clang
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.35.21
Choose a head ref
  • 3 commits
  • 4 files changed
  • 2 contributors

Commits on Jan 11, 2016

  1. Copy the full SHA
    5e42afd View commit details
  2. Merge pull request #7 from juj/vs2015_build_fixes

    vs2015_build_fixes
    juj committed Jan 11, 2016
    Copy the full SHA
    024a52a View commit details

Commits on Jan 13, 2016

  1. 1.35.21

    kripken committed Jan 13, 2016
    Copy the full SHA
    0c163fb View commit details
Showing with 15 additions and 5 deletions.
  1. +1 −1 emscripten-version.txt
  2. +4 −4 include/clang/ASTMatchers/ASTMatchersInternal.h
  3. +5 −0 unittests/ASTMatchers/CMakeLists.txt
  4. +5 −0 unittests/Tooling/CMakeLists.txt
2 changes: 1 addition & 1 deletion emscripten-version.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
"1.35.20"
"1.35.21"

8 changes: 4 additions & 4 deletions include/clang/ASTMatchers/ASTMatchersInternal.h
Original file line number Diff line number Diff line change
@@ -560,10 +560,10 @@ bool matchesFirstInPointerRange(const MatcherT &Matcher, IteratorT Start,

// Metafunction to determine if type T has a member called
// getDecl.
#if defined(_MSC_VER) && (_MSC_VER < 1900) && !defined(__clang__)
// For old versions of MSVC, we use a weird nonstandard __if_exists
// statement, since before MSVC2015, it was not standards-conformant
// enough to compile the usual code below.
#if defined(_MSC_VER) && !defined(__clang__)
// For MSVC, we use a weird nonstandard __if_exists statement, as it
// is not standards-conformant enough to properly compile the standard
// code below. (At least up through MSVC 2015 require this workaround)
template <typename T> struct has_getDecl {
__if_exists(T::getDecl) {
enum { value = 1 };
5 changes: 5 additions & 0 deletions unittests/ASTMatchers/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -5,6 +5,11 @@ set(LLVM_LINK_COMPONENTS
add_clang_unittest(ASTMatchersTests
ASTMatchersTest.cpp)

# XXX Emscripten: Hotfix for bug https://llvm.org/bugs/show_bug.cgi?id=26089
if (MSVC)
set_source_files_properties(ASTMatchersTest.cpp PROPERTIES COMPILE_FLAGS /bigobj)
endif()

target_link_libraries(ASTMatchersTests
clangAST
clangASTMatchers
5 changes: 5 additions & 0 deletions unittests/Tooling/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -19,6 +19,11 @@ add_clang_unittest(ToolingTests
ReplacementsYamlTest.cpp
)

# XXX Emscripten: Hotfix for bug https://llvm.org/bugs/show_bug.cgi?id=26089
if (MSVC)
set_source_files_properties(RecursiveASTVisitorTestExprVisitor.cpp PROPERTIES COMPILE_FLAGS /bigobj)
endif()

target_link_libraries(ToolingTests
clangAST
clangASTMatchers