Merge pull request #22208 from linux-on-ibm-z/s390x-storetag-fix

Fix storeEnumTagSinglePayload on big-endian systems

Author: compnerd

lib/IRGen/EnumPayload.cpp

@@ -162,22 +162,22 @@ void EnumPayload::insertValue(IRGenFunction &IGF, llvm::Value *value,
         subvalue = IGF.Builder.CreateLShr(subvalue,
                                llvm::ConstantInt::get(valueIntTy, valueOffset));
       subvalue = IGF.Builder.CreateZExtOrTrunc(subvalue, payloadIntTy);
-#if defined(__BIG_ENDIAN__)
-      if ((valueBitWidth == 32 || valueBitWidth == 16 || valueBitWidth == 8 || valueBitWidth == 1) &&
-          payloadBitWidth > (payloadValueOffset + valueBitWidth)) {
-        unsigned shiftBitWidth = valueBitWidth;
-        if (valueBitWidth == 1) {
-          shiftBitWidth = 8;
+      if (IGF.IGM.Triple.isLittleEndian()) {
+        if (payloadValueOffset > 0)
+          subvalue = IGF.Builder.CreateShl(subvalue,
+                        llvm::ConstantInt::get(payloadIntTy, payloadValueOffset));
+      } else {
+        if ((valueBitWidth == 32 || valueBitWidth == 16 || valueBitWidth == 8 || valueBitWidth == 1) &&
+            payloadBitWidth > (payloadValueOffset + valueBitWidth)) {
+          unsigned shiftBitWidth = valueBitWidth;
+          if (valueBitWidth == 1) {
+            shiftBitWidth = 8;
+          }
+          subvalue = IGF.Builder.CreateShl(subvalue,
+            llvm::ConstantInt::get(payloadIntTy, (payloadBitWidth - shiftBitWidth) - payloadValueOffset));
         }
-        subvalue = IGF.Builder.CreateShl(subvalue,
-          llvm::ConstantInt::get(payloadIntTy, (payloadBitWidth - shiftBitWidth) - payloadValueOffset));
       }
-#else
-      if (payloadValueOffset > 0)
-        subvalue = IGF.Builder.CreateShl(subvalue,
-                      llvm::ConstantInt::get(payloadIntTy, payloadValueOffset));
-#endif
-      
+
       // If there hasn't yet been a value stored here, we can use the adjusted
       // value directly.
       if (payloadValue.is<llvm::Type *>()) {
@@ -230,21 +230,21 @@ llvm::Value *EnumPayload::extractValue(IRGenFunction &IGF, llvm::Type *type,
         llvm::IntegerType::get(IGF.IGM.getLLVMContext(), payloadBitWidth);
 
       value = IGF.Builder.CreateBitOrPointerCast(value, payloadIntTy);
-#if defined(__BIG_ENDIAN__)
-      if ((valueBitWidth == 32 || valueBitWidth == 16 || valueBitWidth == 8 || valueBitWidth == 1) &&
-          payloadBitWidth > (payloadValueOffset + valueBitWidth)) {
-        unsigned shiftBitWidth = valueBitWidth;
-        if (valueBitWidth == 1) {
-          shiftBitWidth = 8;
+      if (IGF.IGM.Triple.isLittleEndian()) {
+        if (payloadValueOffset > 0)
+          value = IGF.Builder.CreateLShr(value,
+                    llvm::ConstantInt::get(value->getType(), payloadValueOffset));
+      } else {
+        if ((valueBitWidth == 32 || valueBitWidth == 16 || valueBitWidth == 8 || valueBitWidth == 1) &&
+            payloadBitWidth > (payloadValueOffset + valueBitWidth)) {
+          unsigned shiftBitWidth = valueBitWidth;
+          if (valueBitWidth == 1) {
+            shiftBitWidth = 8;
+          }
+          value = IGF.Builder.CreateLShr(value,
+            llvm::ConstantInt::get(value->getType(), (payloadBitWidth - shiftBitWidth) - payloadValueOffset));
         }
-        value = IGF.Builder.CreateLShr(value,
-          llvm::ConstantInt::get(value->getType(), (payloadBitWidth - shiftBitWidth) - payloadValueOffset));
       }
-#else
-      if (payloadValueOffset > 0)
-        value = IGF.Builder.CreateLShr(value,
-                  llvm::ConstantInt::get(value->getType(), payloadValueOffset));
-#endif
       if (valueBitWidth > payloadBitWidth)
         value = IGF.Builder.CreateZExt(value, valueIntTy);
       if (valueOffset > 0)

lib/IRGen/GenEnum.cpp

@@ -4202,12 +4202,12 @@ namespace {
       } else if (!CommonSpareBits.empty()) {
         // Otherwise the payload is just the index.
         payload = EnumPayload::zero(IGM, PayloadSchema);
-#if defined(__BIG_ENDIAN__) && defined(__LP64__)
-        // Code produced above are of type IGM.Int32Ty
-        // However, payload is IGM.SizeTy in 64bit
-        if (numCaseBits >= 64)
-          tagIndex = IGF.Builder.CreateZExt(tagIndex, IGM.SizeTy);
-#endif
+        if (!IGF.IGM.Triple.isLittleEndian()) {
+          if (IGF.IGM.Triple.isArch64Bit() && numCaseBits >= 64) {
+            // Need to set the full 64-bit chunk on big-endian systems.
+            tagIndex = IGF.Builder.CreateZExt(tagIndex, IGM.SizeTy);
+          }
+	}
         // We know we won't use more than numCaseBits from tagIndex's value:
         // We made sure of this in the logic above.
         payload.insertValue(IGF, tagIndex, 0,

stdlib/public/runtime/EnumImpl.h

@@ -170,14 +170,14 @@ inline void storeEnumTagSinglePayloadImpl(
 
     // Store into the value.
 #if defined(__BIG_ENDIAN__)
-  unsigned numPayloadTagBytes = std::min(size_t(4), payloadSize);
-  if (numPayloadTagBytes)
-    small_memcpy(valueAddr,
-                 reinterpret_cast<uint8_t *>(&payloadIndex) + 4 -
-                     numPayloadTagBytes,
-                 numPayloadTagBytes, true);
-  if (payloadSize > 4)
-	    memset(valueAddr + 4, 0, payloadSize - 4);
+  uint64_t payloadIndexBuf = static_cast<uint64_t>(payloadIndex);
+  if (payloadSize >= 8) {
+    memcpy(valueAddr, &payloadIndexBuf, 8);
+    memset(valueAddr + 8, 0, payloadSize - 8);
+  } else if (payloadSize > 0) {
+    payloadIndexBuf <<= (8 - payloadSize) * 8;
+    memcpy(valueAddr, &payloadIndexBuf, payloadSize);
+  }
   if (numExtraTagBytes)
     small_memcpy(extraTagBitAddr,
                  reinterpret_cast<uint8_t *>(&extraTagIndex) + 4 -