commit 2a4e704c92e8ec3d9217a7333368ea53cf3a583f
author Nico Weber <thakis@chromium.org> Tue Oct 27 09:18:42 2020 -0400
committer Nico Weber <thakis@chromium.org> Tue Oct 27 09:26:21 2020 -0400
tree cd2ab2d54860bd48e0b74eb5e85838055ba7af76
parent b19473cf590eca13d23a20191c820d0f9d835beb

Revert "Use uint64_t for branch weights instead of uint32_t"

This reverts commit e5766f25c62c185632e3a75bf45b313eadab774b.
Makes clang assert when building Chromium, see https://crbug.com/1142813
for a repro.

clang/test/CodeGenCXX/attr-likelihood-switch-branch-weights.cpp

diff --git a/clang/test/CodeGenCXX/attr-likelihood-switch-branch-weights.cpp b/clang/test/CodeGenCXX/attr-likelihood-switch-branch-weights.cpp
index 3046b75..5fb7a67 100644
--- a/clang/test/CodeGenCXX/attr-likelihood-switch-branch-weights.cpp
+++ b/clang/test/CodeGenCXX/attr-likelihood-switch-branch-weights.cpp
@@ -177,18 +177,18 @@
   }
 }
 
-// CHECK: !6 = !{!"branch_weights", i64 357913942, i64 715827883}
-// CHECK: !7 = !{!"branch_weights", i64 536870912, i64 1}
-// CHECK: !8 = !{!"branch_weights", i64 238609295, i64 715827883, i64 238609295}
-// CHECK: !9 = !{!"branch_weights", i64 357913942, i64 1, i64 357913942}
-// CHECK: !10 = !{!"branch_weights", i64 357913942, i64 715827883, i64 1}
-// CHECK: !11 = !{!"branch_weights", i64 143165577, i64 143165577, i64 143165577, i64 715827883, i64 143165577}
-// CHECK: !12 = !{!"branch_weights", i64 214748365, i64 214748365, i64 214748365, i64 1, i64 214748365}
-// CHECK: !13 = !{!"branch_weights", i64 79536432, i64 79536432, i64 79536432, i64 79536432, i64 79536432, i64 79536432, i64 79536432, i64 715827883, i64 79536432}
-// CHECK: !14 = !{!"branch_weights", i64 119304648, i64 119304648, i64 119304648, i64 119304648, i64 119304648, i64 119304648, i64 119304648, i64 1, i64 119304648}
-// CHECK: !15 = !{!"branch_weights", i64 2000, i64 1}
-// CHECK: !16 = !{!"branch_weights", i64 1, i64 2000}
-// CHECK: !17 = !{!"branch_weights", i64 715827883, i64 357913942}
-// CHECK: !18 = !{!"branch_weights", i64 1, i64 536870912}
-// CHECK: !19 = !{!"branch_weights", i64 536870912, i64 536870912, i64 268435456}
-// CHECK: !20 = !{!"branch_weights", i64 1, i64 715827883, i64 357913942}
+// CHECK: !6 = !{!"branch_weights", i32 357913942, i32 715827883}
+// CHECK: !7 = !{!"branch_weights", i32 536870912, i32 1}
+// CHECK: !8 = !{!"branch_weights", i32 238609295, i32 715827883, i32 238609295}
+// CHECK: !9 = !{!"branch_weights", i32 357913942, i32 1, i32 357913942}
+// CHECK: !10 = !{!"branch_weights", i32 357913942, i32 715827883, i32 1}
+// CHECK: !11 = !{!"branch_weights", i32 143165577, i32 143165577, i32 143165577, i32 715827883, i32 143165577}
+// CHECK: !12 = !{!"branch_weights", i32 214748365, i32 214748365, i32 214748365, i32 1, i32 214748365}
+// CHECK: !13 = !{!"branch_weights", i32 79536432, i32 79536432, i32 79536432, i32 79536432, i32 79536432, i32 79536432, i32 79536432, i32 715827883, i32 79536432}
+// CHECK: !14 = !{!"branch_weights", i32 119304648, i32 119304648, i32 119304648, i32 119304648, i32 119304648, i32 119304648, i32 119304648, i32 1, i32 119304648}
+// CHECK: !15 = !{!"branch_weights", i32 2000, i32 1}
+// CHECK: !16 = !{!"branch_weights", i32 1, i32 2000}
+// CHECK: !17 = !{!"branch_weights", i32 715827883, i32 357913942}
+// CHECK: !18 = !{!"branch_weights", i32 1, i32 536870912}
+// CHECK: !19 = !{!"branch_weights", i32 536870912, i32 536870912, i32 268435456}
+// CHECK: !20 = !{!"branch_weights", i32 1, i32 715827883, i32 357913942}