Changes from Git (git http://labmaster3.local/git/llvm-zorg.git)


  1. Revert "Modernize" (details)
Commit 65bb175ca08e47eee8c9c9954bbc582f4928eec0 by Adrian Prantl
Revert "Modernize"
This reverts commit 85fc3d80c5c973d72155c54df7d38ad2615905ec.
The file was modifiedzorg/jenkins/

Changes from Git (git http://labmaster3.local/git/llvm-project.git)


  1. Reapply "Fix crash on switch conditions of non-integer types in (details)
  2. Fix `sed -e s@FOO@%/S@` and similar when there's @'s in the working (details)
  3. [TypeCategory] HasLanguage() is now unused. (details)
  4. Add discussion of git-format-patch to Phabricator.html (details)
Commit 878a24ee244a24c39d1c57e9af2e88c621f7cce9 by elizabeth.andrews
Reapply "Fix crash on switch conditions of non-integer types in
This patch reapplies commit 759948467ea. Patch was reverted due to a
clang-tidy test fail on Windows. The test has been modified. There are
no additional code changes.
Patch was tested with ninja check-all on Windows and Linux.
Summary of code changes:
Clang currently crashes for switch statements inside a template when the
condition is a non-integer field member because contextual implicit
conversion is skipped when parsing the condition. This conversion is
however later checked in an assert when the case statement is handled.
The conversion is skipped when parsing the condition because the field
member is set as type-dependent based on its containing class. This
patch sets the type dependency based on the field's type instead.
This patch fixes Bug 40982.
The file was modifiedclang/test/SemaCXX/constant-expression-cxx2a.cpp
The file was modifiedclang-tools-extra/test/clang-tidy/checkers/bugprone-string-integer-assignment.cpp
The file was modifiedclang/test/SemaTemplate/enum-argument.cpp
The file was addedclang/test/SemaTemplate/non-integral-switch-cond.cpp
The file was modifiedclang-tools-extra/test/clang-tidy/checkers/misc-unused-parameters.cpp
The file was modifiedclang/lib/AST/Expr.cpp
The file was modifiedclang/lib/Sema/SemaChecking.cpp
The file was modifiedclang/test/SemaTemplate/member-access-expr.cpp
The file was modifiedclang/test/SemaTemplate/dependent-names.cpp
Commit 327894859cc41c1730807f8a179aa880203262f5 by daniel_l_sanders
Fix `sed -e s@FOO@%/S@` and similar when there's @'s in the working
Jenkins sometimes starts a new working directory by appending @2 (or
incrementing the number if the @n suffix is already there). This causes
several clang tests to fail as:
s@INPUT_DIR@%/S/Inputs@g gets expanded to the invalid:
                              ~~~~~~~~~~ where the part marked with ~'s
is interpreted as the flags. These are invalid and the test fails.
Previous fixes simply exchanged the @ character for another like | but
that's just moving the problem. Address it by adding an expansion that
escapes the @ character we're using as a delimiter as well as other
magic characters in the replacement of sed's s@@@.
There's still room for expansions to cause trouble though. One I ran
into while testing this was that having a directory called foo@bar
causes lots of `CHECK-NOT: foo` directives to match. There's also things
like directories containing `\1`
The file was modifiedclang/test/VFS/external-names.c
The file was modifiedclang/test/VFS/framework-import.m
The file was modifiedclang/test/VFS/test_nonmodular.c
The file was modifiedclang/test/VFS/implicit-include.c
The file was modifiedclang/test/VFS/umbrella-framework-import-skipnonexist.m
The file was modifiedclang/test/VFS/include.c
The file was modifiedclang/test/VFS/include-mixed-real-and-virtual.c
The file was modifiedclang/test/VFS/include-virtual-from-real.c
The file was modifiedclang/test/VFS/relative-path.c
The file was modifiedclang/test/VFS/vfsroot-with-overlay.c
The file was modifiedclang/test/Modules/framework-public-includes-private.m
The file was modifiedclang/test/VFS/incomplete-umbrella.m
The file was modifiedclang/test/Index/index-module-with-vfs.m
The file was modifiedclang/test/Modules/crash-vfs-ivfsoverlay.m
The file was modifiedclang/test/Modules/double-quotes.m
The file was modifiedclang/test/VFS/vfsroot-include.c
The file was modifiedclang/test/VFS/include-real-from-virtual.c
The file was modifiedclang/test/VFS/module-import.m
The file was modifiedclang/test/VFS/module_missing_vfs.m
The file was modifiedclang/test/VFS/vfsroot-module.m
The file was modifiedclang/test/VFS/real-path-found-first.m
The file was modifiedllvm/utils/lit/lit/
Commit 2bb19f93f6a8d0c7ceaa41df744803480c95fe9a by ditaliano
[TypeCategory] HasLanguage() is now unused.
The file was modifiedlldb/include/lldb/DataFormatters/TypeCategory.h
The file was modifiedlldb/source/DataFormatters/TypeCategory.cpp
Commit 06911aee7f86c9dd6ecf16a4b5361fb72f5bc9f1 by kbarton
Add discussion of git-format-patch to Phabricator.html
Summary: There is a discussion of git-format-patch in GettingStarted
guide, but no mention of it in the Phabricator.html page.
Reviewers: jyknight, delcypher
Reviewed By: delcypher
Subscribers: llvm-commits
Tags: #llvm
Differential Revision:
The file was modifiedllvm/docs/Contributing.rst
The file was modifiedllvm/docs/Phabricator.rst