Skip to content

Commit 6e26ff0

Browse files
committed
Merge pull request ReadyTalk#306 from joshuawarner32/openjdk-src-arm-compiler-fix
fix compiler problems discovered in openjdk-src arm bootimage build
2 parents 8471bef + f3968d2 commit 6e26ff0

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

src/compile.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1648,6 +1648,7 @@ class Frame {
16481648

16491649
void storeLarge(ir::Type type, unsigned index)
16501650
{
1651+
assertT(t, type.rawSize() == 8);
16511652
storeLocal(context, 2, type, popLarge(type), index);
16521653
unsigned ti = translateLocalIndex(context, 2, index);
16531654
assertT(t, ti + 1 < localSize());
@@ -1691,7 +1692,7 @@ class Frame {
16911692
{
16921693
ir::Value* s0 = c->pop(ir::Type::i4());
16931694

1694-
if (get(sp - 2) == ir::Type::i8()) {
1695+
if (get(sp - 2).rawSize() == 8) {
16951696
ir::Value* s1 = c->pop(ir::Type::i8());
16961697

16971698
c->push(ir::Type::i4(), s0);
@@ -1724,7 +1725,7 @@ class Frame {
17241725

17251726
void dup2()
17261727
{
1727-
if (get(sp - 1) == ir::Type::i8()) {
1728+
if (get(sp - 1).rawSize() == 8) {
17281729
c->push(ir::Type::i8(), c->peek(2, 0));
17291730
} else {
17301731
ir::Value* s0 = c->pop(ir::Type::i4());
@@ -1750,7 +1751,7 @@ class Frame {
17501751

17511752
void dup2X1()
17521753
{
1753-
if (get(sp - 1) == ir::Type::i8()) {
1754+
if (get(sp - 1).rawSize() == 8) {
17541755
ir::Value* s0 = c->pop(ir::Type::i8());
17551756
ir::Value* s1 = c->pop(ir::Type::i4());
17561757

@@ -1787,10 +1788,10 @@ class Frame {
17871788

17881789
void dup2X2()
17891790
{
1790-
if (get(sp - 1) == ir::Type::i8()) {
1791+
if (get(sp - 1).rawSize() == 8) {
17911792
ir::Value* s0 = c->pop(ir::Type::i8());
17921793

1793-
if (get(sp - 3) == ir::Type::i8()) {
1794+
if (get(sp - 3).rawSize() == 8) {
17941795
ir::Value* s1 = c->pop(ir::Type::i8());
17951796

17961797
c->push(ir::Type::i8(), s0);

0 commit comments

Comments
 (0)