# HG changeset patch
# User Andreas Woess <andreas.woess@oracle.com>
# Date 1442933169 -7200
# Node ID 0e5aa5fd5060ff297006a779be562ab35de5d6a9
# Parent  c8f4168061ea8e1b4a6fb49e2f4317925261f5b5
fix implicit int-to-long cast issue

diff -r c8f4168061ea -r 0e5aa5fd5060 truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/LayoutImpl.java
--- a/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/LayoutImpl.java	Fri Sep 25 16:19:41 2015 +0200
+++ b/truffle/com.oracle.truffle.object/src/com/oracle/truffle/object/LayoutImpl.java	Tue Sep 22 16:46:09 2015 +0200
@@ -135,7 +135,7 @@
             newLocation = oldLocation;
         } else if (oldLocation instanceof DoubleLocation && (value instanceof Double || this.isAllowedIntToDouble() && value instanceof Integer)) {
             newLocation = oldLocation;
-        } else if (oldLocation instanceof LongLocation && (value instanceof Long || this.isAllowedIntToLong() && value instanceof Long)) {
+        } else if (oldLocation instanceof LongLocation && (value instanceof Long || this.isAllowedIntToLong() && value instanceof Integer)) {
             newLocation = oldLocation;
         } else if (oldLocation instanceof DeclaredLocation) {
             return oldShape.allocator().locationForValue(value, EnumSet.of(LocationModifier.Final, LocationModifier.NonNull));