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

  CONFLICT (content): Merge conflict in clang/lib/CodeGen/CodeGenModule.cpp

Author: XinWang10

clang/lib/CodeGen/CodeGenModule.cpp

@@ -2090,11 +2090,9 @@ void CodeGenModule::EmitCtorList(CtorList &Fns, const char *GlobalName) {
   for (const auto &I : Fns) {
     auto ctor = ctors.beginStruct(CtorStructTy);
     ctor.addInt(Int32Ty, I.Priority);
-    ctor.add(llvm::ConstantExpr::getBitCast(I.Initializer, CtorPFTy));
-    // Emit appropriate bitcasts for pointers of different address spaces.
+    ctor.add(I.Initializer);
     if (I.AssociatedData)
-      ctor.add(llvm::ConstantExpr::getPointerBitCastOrAddrSpaceCast(
-          I.AssociatedData, TargetType));
+      ctor.add(I.AssociatedData);
     else
       ctor.addNullPointer(TargetType);
     ctor.finishAndAddTo(ctors);
@@ -4995,9 +4993,7 @@ llvm::Constant *CodeGenModule::GetFunctionStart(const ValueDecl *Decl) {
   llvm::GlobalValue *F =
       cast<llvm::GlobalValue>(GetAddrOfFunction(Decl)->stripPointerCasts());
 
-  return llvm::ConstantExpr::getBitCast(
-      llvm::NoCFIValue::get(F),
-      llvm::PointerType::get(VMContext, F->getAddressSpace()));
+  return llvm::NoCFIValue::get(F);
 }
 
 static const FunctionDecl *

clang/lib/Format/TokenAnnotator.cpp

@@ -3409,8 +3409,10 @@ static bool isFunctionDeclarationName(bool IsCpp, const FormatToken &Current,
         Tok->isOneOf(TT_PointerOrReference, TT_StartOfName, tok::ellipsis)) {
       return true;
     }
-    if (Tok->isOneOf(tok::l_brace, TT_ObjCMethodExpr) || Tok->Tok.isLiteral())
+    if (Tok->isOneOf(tok::l_brace, tok::string_literal, TT_ObjCMethodExpr) ||
+        Tok->Tok.isLiteral()) {
       return false;
+    }
   }
   return false;
 }