Fix tuple concatenation for different sequence types

Author: msimacek

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/tuple/TupleBuiltins.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2019, Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2020, Oracle and/or its affiliates.
  * Copyright (c) 2014, Regents of the University of California
  *
  * All rights reserved.
@@ -507,11 +507,15 @@ PNotImplemented contains(@SuppressWarnings("unused") Object self, @SuppressWarni
     abstract static class AddNode extends PythonBuiltinNode {
         @Specialization
         PTuple doPTuple(PTuple left, PTuple right,
-                        @Cached("create()") SequenceStorageNodes.ConcatNode concatNode) {
+                        @Cached("createConcat()") SequenceStorageNodes.ConcatNode concatNode) {
             SequenceStorage concatenated = concatNode.execute(left.getSequenceStorage(), right.getSequenceStorage());
             return factory().createTuple(concatenated);
         }
 
+        protected static SequenceStorageNodes.ConcatNode createConcat() {
+            return SequenceStorageNodes.ConcatNode.create(() -> SequenceStorageNodes.ListGeneralizationNode.create());
+        }
+
         @Fallback
         Object doGeneric(@SuppressWarnings("unused") Object left, Object right) {
             throw raise(TypeError, "can only concatenate tuple (not \"%p\") to tuple", right);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/literal/TupleLiteralNode.java

@@ -26,6 +26,7 @@
 package com.oracle.graal.python.nodes.literal;
 
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes;
+import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.ListGeneralizationNode;
 import com.oracle.graal.python.builtins.objects.common.SequenceStorageNodes.NoGeneralizationNode;
 import com.oracle.graal.python.builtins.objects.tuple.PTuple;
 import com.oracle.graal.python.nodes.PNode;
@@ -94,7 +95,7 @@ private PTuple directTuple(VirtualFrame frame) {
     private SequenceStorageNodes.ConcatNode ensureConcatStoragesNode() {
         if (concatStoragesNode == null) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
-            concatStoragesNode = insert(SequenceStorageNodes.ConcatNode.create());
+            concatStoragesNode = insert(SequenceStorageNodes.ConcatNode.create(ListGeneralizationNode::create));
         }
         return concatStoragesNode;
     }