8282372: [11] build issue on MacOS/aarch64 12.2.1 using Xcode 13.1: call to 'log2_intptr' is ambiguous

GoeLin · GoeLin · commit 80a27773cbba · 2022-02-25T22:23:14.000Z
Reviewed-by: clanger
diff --git a/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp b/src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
@@ -89,7 +89,7 @@ class MacroAssembler: public Assembler {
       = (operand_valid_for_logical_immediate(false /*is32*/,
                                              (uint64_t)Universe::narrow_klass_base())
          && ((uint64_t)Universe::narrow_klass_base()
-             > (1ULL << log2_intptr(Universe::narrow_klass_range()))));
+             > (1ULL << log2_intptr(checked_cast<uintptr_t>(Universe::narrow_klass_range())))));
   }
 
  // These routines should emit JVMTI PopFrame and ForceEarlyReturn handling code.

Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ class MacroAssembler: public Assembler {`
`89`	`89`	`= (operand_valid_for_logical_immediate(false /is32/,`
`90`	`90`	`(uint64_t)Universe::narrow_klass_base())`
`91`	`91`	`&& ((uint64_t)Universe::narrow_klass_base()`
`92`		`- > (1ULL << log2_intptr(Universe::narrow_klass_range()))));`
	`92`	`+ > (1ULL << log2_intptr(checked_cast<uintptr_t>(Universe::narrow_klass_range())))));`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`// These routines should emit JVMTI PopFrame and ForceEarlyReturn handling code.`