Merge from '"main"' to '"sycl-web"' (2 commits)

  CONFLICT (content): Merge conflict in libclc/CMakeLists.txt

Author: MrSidims

bolt/README.md

@@ -28,7 +28,7 @@ generated by Clang/GCC.
 NOTE: BOLT is currently incompatible with the `-freorder-blocks-and-partition`
 compiler option. Since GCC8 enables this option by default, you have to
 explicitly disable it by adding `-fno-reorder-blocks-and-partition` flag if
-you are compiling with GCC8.
+you are compiling with GCC8 or above.
 
 PIE and .so support has been added recently. Please report bugs if you
 encounter any issues.
@@ -37,7 +37,7 @@ encounter any issues.
 
 ### Docker Image
 
-You can build and use the docker image containing BOLT using our [docker file](./bolt/utils/docker/Dockerfile).
+You can build and use the docker image containing BOLT using our [docker file](utils/docker/Dockerfile).
 Alternatively, you can build BOLT manually using the steps below.
 
 ### Manual Build
@@ -46,22 +46,19 @@ BOLT heavily uses LLVM libraries, and by design, it is built as one of LLVM
 tools. The build process is not much different from a regular LLVM build.
 The following instructions are assuming that you are running under Linux.
 
-Start with cloning LLVM and BOLT repos:
+Start with cloning LLVM repo:
 
 ```
-> git clone https://github.com/facebookincubator/BOLT llvm-bolt
+> git clone https://github.com/llvm/llvm-project.git
 > mkdir build
 > cd build
-> cmake -G Ninja ../llvm-bolt/llvm -DLLVM_TARGETS_TO_BUILD="X86;AArch64" -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_ENABLE_PROJECTS="clang;lld;bolt"
-> ninja
+> cmake -G Ninja ../llvm-project/llvm -DLLVM_TARGETS_TO_BUILD="X86;AArch64" -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_ASSERTIONS=ON -DLLVM_ENABLE_PROJECTS="bolt"
+> ninja bolt
 ```
 
 `llvm-bolt` will be available under `bin/`. Add this directory to your path to
 ensure the rest of the commands in this tutorial work.
 
-Note that we use a specific snapshot of LLVM monorepo as we currently
-rely on a set of patches that are not yet upstreamed.
-
 ## Optimizing BOLT's Performance
 
 BOLT runs many internal passes in parallel. If you foresee heavy usage of
@@ -80,7 +77,7 @@ Or if you rather use tcmalloc:
 
 ## Usage
 
-For a complete practical guide of using BOLT see [Optimizing Clang with BOLT](./bolt/docs/OptimizingClang.md).
+For a complete practical guide of using BOLT see [Optimizing Clang with BOLT](docs/OptimizingClang.md).
 
 ### Step 0
 

bolt/test/runtime/Inputs/exceptions_split.cpp renamed to bolt/test/runtime/X86/Inputs/exceptions_split.cpp

@@ -11,7 +11,7 @@ RUN apt-get update && \
 
 WORKDIR /home/bolt
 
-RUN git clone --depth 1 https://github.com/facebookincubator/BOLT llvm-project
+RUN git clone --depth 1 https://github.com/llvm/llvm-project
 
 RUN mkdir build && \
     cd build && \

bolt/test/runtime/exceptions-instrumentation.test renamed to bolt/test/runtime/X86/exceptions-instrumentation.test

@@ -43,6 +43,8 @@ removeNamespaces(const std::vector<std::string> &Names) {
 StringConstructorCheck::StringConstructorCheck(StringRef Name,
                                                ClangTidyContext *Context)
     : ClangTidyCheck(Name, Context),
+      IsStringviewNullptrCheckEnabled(
+          Context->isCheckEnabled("bugprone-stringview-nullptr")),
       WarnOnLargeLength(Options.get("WarnOnLargeLength", true)),
       LargeLengthThreshold(Options.get("LargeLengthThreshold", 0x800000)),
       StringNames(utils::options::parseStringList(
@@ -121,17 +123,20 @@ void StringConstructorCheck::registerMatchers(MatchFinder *Finder) {
   // Check the literal string constructor with char pointer.
   // [i.e. string (const char* s);]
   Finder->addMatcher(
-      traverse(TK_AsIs,
-               cxxConstructExpr(
-                   hasDeclaration(cxxConstructorDecl(ofClass(cxxRecordDecl(
-                       hasAnyName(removeNamespaces(StringNames)))))),
-                   hasArgument(0, expr().bind("from-ptr")),
-                   // do not match std::string(ptr, int)
-                   // match std::string(ptr, alloc)
-                   // match std::string(ptr)
-                   anyOf(hasArgument(1, unless(hasType(isInteger()))),
-                         argumentCountIs(1)))
-                   .bind("constructor")),
+      traverse(
+          TK_AsIs,
+          cxxConstructExpr(
+              hasDeclaration(cxxConstructorDecl(ofClass(anyOf(
+                  cxxRecordDecl(hasName("basic_string_view"))
+                      .bind("basic_string_view_decl"),
+                  cxxRecordDecl(hasAnyName(removeNamespaces(StringNames))))))),
+              hasArgument(0, expr().bind("from-ptr")),
+              // do not match std::string(ptr, int)
+              // match std::string(ptr, alloc)
+              // match std::string(ptr)
+              anyOf(hasArgument(1, unless(hasType(isInteger()))),
+                    argumentCountIs(1)))
+              .bind("constructor")),
       this);
 }
 
@@ -167,6 +172,12 @@ void StringConstructorCheck::check(const MatchFinder::MatchResult &Result) {
         Ptr->EvaluateAsRValue(ConstPtr, Ctx) &&
         ((ConstPtr.Val.isInt() && ConstPtr.Val.getInt().isZero()) ||
          (ConstPtr.Val.isLValue() && ConstPtr.Val.isNullPointer()))) {
+      if (IsStringviewNullptrCheckEnabled &&
+          Result.Nodes.getNodeAs<CXXRecordDecl>("basic_string_view_decl")) {
+        // Filter out `basic_string_view` to avoid conflicts with
+        // `bugprone-stringview-nullptr`
+        return;
+      }
       diag(Loc, "constructing string from nullptr is undefined behaviour");
     }
   }

bolt/utils/docker/Dockerfile

@@ -30,6 +30,7 @@ class StringConstructorCheck : public ClangTidyCheck {
   void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
 
 private:
+  const bool IsStringviewNullptrCheckEnabled;
   const bool WarnOnLargeLength;
   const unsigned int LargeLengthThreshold;
   std::vector<std::string> StringNames;