diff options
| author | kvn <none@none> | 2013-06-20 16:08:11 -0700 |
|---|---|---|
| committer | kvn <none@none> | 2013-06-20 16:08:11 -0700 |
| commit | bb2b6f4b8b3cca35c143fa1df8743fe8554d7055 (patch) | |
| tree | c006e5ba368d5a3fcbc1ab5c0aa612a3e1850826 /src/share/vm/c1 | |
| parent | 274b53932a161c8fad5e4d221aaefc30af99a647 (diff) | |
| parent | b938dfd41e553ca5710c406d3c38d69c5fa01e20 (diff) | |
Merge
Diffstat (limited to 'src/share/vm/c1')
| -rw-r--r-- | src/share/vm/c1/c1_LIR.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/share/vm/c1/c1_LIR.cpp b/src/share/vm/c1/c1_LIR.cpp index f26d1812c..e2611534e 100644 --- a/src/share/vm/c1/c1_LIR.cpp +++ b/src/share/vm/c1/c1_LIR.cpp @@ -201,23 +201,24 @@ void LIR_OprDesc::validate_type() const { #ifdef ASSERT if (!is_pointer() && !is_illegal()) { + OprKind kindfield = kind_field(); // Factored out because of compiler bug, see 8002160 switch (as_BasicType(type_field())) { case T_LONG: - assert((kind_field() == cpu_register || kind_field() == stack_value) && + assert((kindfield == cpu_register || kindfield == stack_value) && size_field() == double_size, "must match"); break; case T_FLOAT: // FP return values can be also in CPU registers on ARM and PPC (softfp ABI) - assert((kind_field() == fpu_register || kind_field() == stack_value - ARM_ONLY(|| kind_field() == cpu_register) - PPC_ONLY(|| kind_field() == cpu_register) ) && + assert((kindfield == fpu_register || kindfield == stack_value + ARM_ONLY(|| kindfield == cpu_register) + PPC_ONLY(|| kindfield == cpu_register) ) && size_field() == single_size, "must match"); break; case T_DOUBLE: // FP return values can be also in CPU registers on ARM and PPC (softfp ABI) - assert((kind_field() == fpu_register || kind_field() == stack_value - ARM_ONLY(|| kind_field() == cpu_register) - PPC_ONLY(|| kind_field() == cpu_register) ) && + assert((kindfield == fpu_register || kindfield == stack_value + ARM_ONLY(|| kindfield == cpu_register) + PPC_ONLY(|| kindfield == cpu_register) ) && size_field() == double_size, "must match"); break; case T_BOOLEAN: @@ -229,7 +230,7 @@ void LIR_OprDesc::validate_type() const { case T_OBJECT: case T_METADATA: case T_ARRAY: - assert((kind_field() == cpu_register || kind_field() == stack_value) && + assert((kindfield == cpu_register || kindfield == stack_value) && size_field() == single_size, "must match"); break; |