# HG changeset patch # User kbarrett # Date 1547614745 0 # Wed Jan 16 04:59:05 2019 +0000 # Node ID bca8195a3bc70df281a73d9a40032c673971676c # Parent 09abae195e9a7e134a1cfd9b375a6f4d95091de7 8160748: [AArch64] Inconsistent types for ideal_reg Summary: Made ideal_reg consistently uint. Reviewed-by: kvn, iveresov diff --git openjdk.orig/hotspot/src/cpu/aarch64/vm/aarch64.ad openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad --- openjdk.orig/hotspot/src/cpu/aarch64/vm/aarch64.ad +++ openjdk/hotspot/src/cpu/aarch64/vm/aarch64.ad @@ -1,6 +1,6 @@ // +// Copyright (c) 2003, 2017, Oracle and/or its affiliates. All rights reserved. // Copyright (c) 2013, Red Hat Inc. -// Copyright (c) 2003, 2012, Oracle and/or its affiliates. // All rights reserved. // DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. // @@ -3449,7 +3449,7 @@ } // Vector ideal reg. -const int Matcher::vector_ideal_reg(int len) { +const uint Matcher::vector_ideal_reg(int len) { switch(len) { case 8: return Op_VecD; case 16: return Op_VecX; @@ -3458,7 +3458,7 @@ return 0; } -const int Matcher::vector_shift_count_ideal_reg(int size) { +const uint Matcher::vector_shift_count_ideal_reg(int size) { return Op_VecX; }