Fix merge conflicts.

fangerer · fangerer · commit bfea05daa5cc · 2019-02-08T09:46:07.000+01:00
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -128,6 +128,7 @@
 import com.oracle.graal.python.runtime.sequence.storage.TypedSequenceStorage;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.dsl.Cached;
 import com.oracle.truffle.api.dsl.Fallback;
 import com.oracle.truffle.api.dsl.ImportStatic;
@@ -3013,7 +3014,6 @@ Object[] doFallback(@SuppressWarnings("unused") SequenceStorage s) {
             throw raise(TypeError, "unsupported sequence type");
         }
 
-        @TruffleBoundary
         private static <T> T[] exactCopy(T[] barr, int len) {
             return Arrays.copyOf(barr, len);
         }

Original file line number	Diff line number	Diff line change
`@@ -128,6 +128,7 @@`
`128`	`128`	`import com.oracle.graal.python.runtime.sequence.storage.TypedSequenceStorage;`
`129`	`129`	`import com.oracle.truffle.api.CompilerDirectives;`
`130`	`130`	`import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;`
	`131`	`+import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;`
`131`	`132`	`import com.oracle.truffle.api.dsl.Cached;`
`132`	`133`	`import com.oracle.truffle.api.dsl.Fallback;`
`133`	`134`	`import com.oracle.truffle.api.dsl.ImportStatic;`
`@@ -3013,7 +3014,6 @@ Object[] doFallback(@SuppressWarnings("unused") SequenceStorage s) {`
`3013`	`3014`	`throw raise(TypeError, "unsupported sequence type");`
`3014`	`3015`	`}`
`3015`	`3016`
`3016`		`- @TruffleBoundary`
`3017`	`3017`	`private static <T> T[] exactCopy(T[] barr, int len) {`
`3018`	`3018`	`return Arrays.copyOf(barr, len);`
`3019`	`3019`	`}`