am 51da51a2: am 02effee6: Correctly compute the type of an assignment expression.
Merge commit '51da51a2d11a745909b4ad9a9b6ac5d9858632d5' into eclair-mr2-plus-aosp
* commit '51da51a2d11a745909b4ad9a9b6ac5d9858632d5':
Correctly compute the type of an assignment expression.
diff --git a/libacc/acc.cpp b/libacc/acc.cpp
index 6d9213c..808752e 100644
--- a/libacc/acc.cpp
+++ b/libacc/acc.cpp
@@ -1666,6 +1666,7 @@
pDestType->tag);
break;
}
+ setR0Type(pDestType);
}
virtual void loadR0FromR0() {
@@ -2836,6 +2837,7 @@
pTargetType->tag);
break;
}
+ setR0Type(pTargetType);
}
virtual void loadR0FromR0() {
diff --git a/libacc/tests/data/assignment.c b/libacc/tests/data/assignment.c
new file mode 100644
index 0000000..4fc7801
--- /dev/null
+++ b/libacc/tests/data/assignment.c
@@ -0,0 +1,9 @@
+int main() {
+ int a = 0;
+ int b = 1;
+ a = b = 2; // Test that "b = 2" generates an rvalue.
+ if (a = 7) { // Test that a = 7 generates an rvalue.
+ b = 3;
+ }
+ return a;
+}
diff --git a/libacc/tests/test.py b/libacc/tests/test.py
index c982d16..d984301 100644
--- a/libacc/tests/test.py
+++ b/libacc/tests/test.py
@@ -426,6 +426,11 @@
result: -2
""","""""")
+ def testAssignment(self):
+ self.compileCheck(["-R", "data/assignment.c"], """Executing compiled code:
+result: 7
+""","""""")
+
def testArray(self):
self.compileCheck(["-R", "data/array.c"], """Executing compiled code:
localInt: 3