Fixed code generation for parameter type conversion (536482)

Change-Id: I5d9771bf737e6c104294c8528d7553494d10ab62
Signed-off-by: Botond Baranyi <botond.baranyi@ericsson.com>

compiler2/TypeCompat.cc

@@ -166,6 +166,7 @@ char *TypeConv::gen_conv_code_refd(char *p_str, const char *p_name,
   const char *tmp_id_str1 = tmp_id1.c_str();  // For "p_val/p_temp".
   const string& tmp_id2 = p_val_or_temp->get_temporary_id();
   const char *tmp_id_str2 = tmp_id2.c_str();  // For converted "p_val/p_temp".
+  p_str = mputprintf(p_str, "%s %s;\n", current_type_genname.c_str(), tmp_id_str2);
   expression_struct expr;
   Code::init_expr(&expr);
   expr.expr = mputprintf(expr.expr,
@@ -180,12 +181,11 @@ char *TypeConv::gen_conv_code_refd(char *p_str, const char *p_name,
     static_cast<Value *>(p_val_or_temp)->get_reference()->generate_code(&expr);
   else static_cast<Template *>(p_val_or_temp)->get_reference()->generate_code(&expr);
   expr.expr = mputprintf(expr.expr,
-    ";\n%s %s;\n"
+    ";\n"
     "if (!%s(%s, %s)) TTCN_error(\"Values or templates of types `%s' and "
     "`%s' are not compatible at run-time\")",  // ";\n" will be added later.
-    current_type_genname.c_str(), tmp_id_str2, get_conv_func(original_type,
-    current_type, my_scope->get_scope_mod()).c_str(), tmp_id_str2,
-    tmp_id_str1, original_type->get_typename().c_str(),
+    get_conv_func(original_type, current_type, my_scope->get_scope_mod()).c_str(),
+    tmp_id_str2, tmp_id_str1, original_type->get_typename().c_str(),
     current_type->get_typename().c_str());
   // Merge by hand.  Code::merge_free_expr() puts an additional ";\n".
   // "p_str" is just a local pointer here, it needs an mputprintf() at the

regression_test/compileonly/Makefile

@@ -36,5 +36,9 @@ ifdef DYN
 CODIRS +=  mfgen-xsd
 endif
 
+ifdef RT2
+CODIRS += typeCompat
+endif
+
 all dep clean distclean:
 	for dir in $(CODIRS); do $(MAKE) -C $$dir $@ || exit; done

regression_test/compileonly/typeCompat/.gitignore

+typeCompat
+typeCompat.exe
+typeCompat*.cc
+typeCompat*.hh

regression_test/compileonly/typeCompat/Makefile

+##############################################################################
+# Copyright (c) 2000-2018 Ericsson Telecom AB
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+#
+# Contributors:
+#   Botond, Baranyi
+#
+##############################################################################
+TOPDIR := ../..
+include $(TOPDIR)/Makefile.regression
+
+.PHONY: all clean dep
+
+TTCN3_LIB = ttcn3$(RT2_SUFFIX)$(DYNAMIC_SUFFIX)
+
+TTCN3_MODULES = typeCompat.ttcn
+
+GENERATED_SOURCES = $(TTCN3_MODULES:.ttcn=.cc)
+GENERATED_HEADERS = $(GENERATED_SOURCES:.cc=.hh)
+ifdef CODE_SPLIT
+GENERATED_SOURCES := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), .cc _seq.cc _set.cc  _seqof.cc _setof.cc _union.cc))
+else ifdef SPLIT_TO_SLICES
+POSTFIXES := $(foreach file, $(SPLIT_TO_SLICES), $(addsuffix $(file), _part_))
+POSTFIXES := $(foreach file, $(POSTFIXES), $(addprefix $(file), .cc))
+GENERATED_SOURCES2 := $(foreach file, $(GENERATED_SOURCES:.cc=), $(addprefix $(file), $(POSTFIXES)))
+GENERATED_SOURCES += $(GENERATED_SOURCES2)
+endif
+
+OBJECTS = $(GENERATED_SOURCES:.cc=.o)
+
+TARGET = typeCompat$(EXESUFFIX)
+
+all: $(TARGET)
+
+$(TARGET): $(GENERATED_SOURCES) $(USER_SOURCES)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ -L$(TTCN3_DIR)/lib -l$(TTCN3_LIB) \
+	-L$(OPENSSL_DIR)/lib -lcrypto $($(PLATFORM)_LIBS)
+
+$(GENERATED_SOURCES) $(GENERATED_HEADERS): $(TTCN3_MODULES)
+	$(TTCN3_COMPILER) $(COMPILER_FLAGS) $^
+
+clean distclean:
+	$(RM) $(TARGET) $(OBJECTS) $(GENERATED_HEADERS) \
+	$(GENERATED_SOURCES) compile *.log
+
+dep: $(GENERATED_SOURCES)
+	makedepend $(CPPFLAGS) $(GENERATED_SOURCES)

regression_test/compileonly/typeCompat/typeCompat.ttcn

+/******************************************************************************
+ * Copyright (c) 2000-2018 Ericsson Telecom AB
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.html
+ *
+ * Contributors:
+ *   Baranyi, Botond
+ *
+ ******************************************************************************/
+
+// This module tests the code generation for parameters with type conversion (bug fix 536482)
+module typeCompat {
+
+type enumerated Enum { One, Two, Three };
+
+type record Rec1 {
+  record of Enum f1
+}
+
+type record Rec2 {
+  record of Enum f1
+}
+
+template Rec1 t_pard1(in template Rec1.f1 p) := { p };
+
+template Rec2 t_pard2(in template Rec1.f1 p) := { p };
+
+control {
+  var template Rec1 x := t_pard1(t_pard2( { One, Two, Three } ).f1);
+}
+
+}