Merged main:fef1bec39642 into amd-gfx:b13841aa3970

Local branch amd-gfx b13841a Merged main:11fbbcb3106a into amd-gfx:2fc17a552619
Remote branch main fef1bec [X86]Remove X86-specific dead code in ScheduleDAGRRList.cpp (llvm#67629)

Author: SC llvm team

clang/lib/AST/Interp/ByteCodeExprGen.cpp

@@ -881,8 +881,8 @@ bool ByteCodeExprGen<Emitter>::VisitStringLiteral(const StringLiteral *E) {
 
   // If the initializer string is too long, a diagnostic has already been
   // emitted. Read only the array length from the string literal.
-  unsigned N =
-      std::min(unsigned(CAT->getSize().getZExtValue()), E->getLength());
+  unsigned ArraySize = CAT->getSize().getZExtValue();
+  unsigned N = std::min(ArraySize, E->getLength());
   size_t CharWidth = E->getCharByteWidth();
 
   for (unsigned I = 0; I != N; ++I) {
@@ -901,6 +901,23 @@ bool ByteCodeExprGen<Emitter>::VisitStringLiteral(const StringLiteral *E) {
       llvm_unreachable("unsupported character width");
     }
   }
+
+  // Fill up the rest of the char array with NUL bytes.
+  for (unsigned I = N; I != ArraySize; ++I) {
+    if (CharWidth == 1) {
+      this->emitConstSint8(0, E);
+      this->emitInitElemSint8(I, E);
+    } else if (CharWidth == 2) {
+      this->emitConstUint16(0, E);
+      this->emitInitElemUint16(I, E);
+    } else if (CharWidth == 4) {
+      this->emitConstUint32(0, E);
+      this->emitInitElemUint32(I, E);
+    } else {
+      llvm_unreachable("unsupported character width");
+    }
+  }
+
   return true;
 }
 

clang/test/AST/Interp/arrays.cpp

@@ -369,3 +369,24 @@ namespace ArrayInitLoop {
   static_assert(g() == 6); // expected-error {{failed}} \
                            // expected-note {{15 == 6}}
 }
+
+namespace StringZeroFill {
+  struct A {
+    char c[6];
+  };
+  constexpr A a = { "abc" };
+  static_assert(a.c[0] == 'a', "");
+  static_assert(a.c[1] == 'b', "");
+  static_assert(a.c[2] == 'c', "");
+  static_assert(a.c[3] == '\0', "");
+  static_assert(a.c[4] == '\0', "");
+  static_assert(a.c[5] == '\0', "");
+
+  constexpr char b[6] = "foo";
+  static_assert(b[0] == 'f', "");
+  static_assert(b[1] == 'o', "");
+  static_assert(b[2] == 'o', "");
+  static_assert(b[3] == '\0', "");
+  static_assert(b[4] == '\0', "");
+  static_assert(b[5] == '\0', "");
+}

llvm/include/llvm/Config/llvm-config.h.cmake

@@ -16,7 +16,7 @@
 
 /* Indicate that this is LLVM compiled from the amd-gfx branch. */
 #define LLVM_HAVE_BRANCH_AMD_GFX
-#define LLVM_MAIN_REVISION 476444
+#define LLVM_MAIN_REVISION 476447
 
 /* Define if LLVM_ENABLE_DUMP is enabled */
 #cmakedefine LLVM_ENABLE_DUMP

llvm/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp

@@ -986,11 +986,6 @@ SUnit *ScheduleDAGRRList::TryUnfoldSU(SUnit *SU) {
   if (!TII->unfoldMemoryOperand(*DAG, N, NewNodes))
     return nullptr;
 
-  // unfolding an x86 DEC64m operation results in store, dec, load which
-  // can't be handled here so quit
-  if (NewNodes.size() == 3)
-    return nullptr;
-
   assert(NewNodes.size() == 2 && "Expected a load folding node!");
 
   N = NewNodes[1];

llvm/lib/Passes/StandardInstrumentations.cpp

@@ -702,19 +702,19 @@ static SmallString<32> getIRFileDisplayName(Any IR) {
   stable_hash NameHash = stable_hash_combine_string(M->getName());
   unsigned int MaxHashWidth = sizeof(stable_hash) * 8 / 4;
   write_hex(ResultStream, NameHash, HexPrintStyle::Lower, MaxHashWidth);
-  if (any_cast<const Module *>(&IR)) {
+  if (llvm::any_cast<const Module *>(&IR)) {
     ResultStream << "-module";
-  } else if (const Function **F = any_cast<const Function *>(&IR)) {
+  } else if (const Function **F = llvm::any_cast<const Function *>(&IR)) {
     ResultStream << "-function-";
     stable_hash FunctionNameHash = stable_hash_combine_string((*F)->getName());
     write_hex(ResultStream, FunctionNameHash, HexPrintStyle::Lower,
               MaxHashWidth);
   } else if (const LazyCallGraph::SCC **C =
-                 any_cast<const LazyCallGraph::SCC *>(&IR)) {
+                 llvm::any_cast<const LazyCallGraph::SCC *>(&IR)) {
     ResultStream << "-scc-";
     stable_hash SCCNameHash = stable_hash_combine_string((*C)->getName());
     write_hex(ResultStream, SCCNameHash, HexPrintStyle::Lower, MaxHashWidth);
-  } else if (const Loop **L = any_cast<const Loop *>(&IR)) {
+  } else if (const Loop **L = llvm::any_cast<const Loop *>(&IR)) {
     ResultStream << "-loop-";
     stable_hash LoopNameHash = stable_hash_combine_string((*L)->getName());
     write_hex(ResultStream, LoopNameHash, HexPrintStyle::Lower, MaxHashWidth);