Refine structure type comparison (760)

The prior method of comparing structures by examining them for identical
layout failed if you wanted to have two structures that purposely had
the same layout but wanted their semantics to be different (for example,
by having a function that would work on only one of them).

Change the struct type checking comparisons to check NAME as well as
struct layout. Also need to no longer mangle the name when reading in
oso.

While I was there, and adding a new test for this, I renamed a test
I added recently, to more closely match other related ones.

Author: lgritz

CMakeLists.txt

@@ -237,7 +237,6 @@ TESTSUITE ( and-or-not-synonyms aastep arithmetic array array-derivs array-range
             draw_string
             error-dupes exit exponential
             function-earlyreturn function-simple function-outputelem
-            function-overload-struct
             geomath getattribute-camera getattribute-shader
             getsymbol-nonheap gettextureinfo
             group-outputs groupstring
@@ -276,8 +275,9 @@ TESTSUITE ( and-or-not-synonyms aastep arithmetic array array-derivs array-range
             select shortcircuit spline splineinverse spline-derivbug
             string
             struct struct-array struct-array-mixture
-            struct-err struct-init-copy struct-layers
-            struct-return struct-with-array
+            struct-err struct-init-copy
+            struct-isomorphic-overload struct-layers
+            struct-operator-overload struct-return struct-with-array
             struct-nested struct-nested-assign struct-nested-deep
             ternary
             testshade-expr

src/liboslexec/osogram.y

@@ -212,9 +212,7 @@ typespec
                 }
         | STRUCT IDENTIFIER
                 {
-                    // Prepend the shader name to make globally unique
-                    std::string mangled = current_shader_name + "_" + $2;
-                    current_typespec = TypeSpec (mangled.c_str(), 0);
+                    current_typespec = TypeSpec ($2, 0);
                     $$ = 0;
                 }
         ;

src/liboslexec/typespec.cpp

@@ -156,9 +156,11 @@ equivalent (const TypeSpec &a, const TypeSpec &b)
     if (a == b)
         return true;
     // or if they are structs, and the structs are equivalent
-    if (a.is_structure() || b.is_structure())
+    if (a.is_structure() || b.is_structure()) {
         return a.is_structure() && b.is_structure() &&
+               a.structspec()->name() == b.structspec()->name() &&
                equivalent(a.structspec(), b.structspec());
+    }
     // or if the underlying simple types are equivalent
     return
         ((a.is_vectriple_based() && b.is_vectriple_based()) || equivalent(a.m_simple, b.m_simple))

…ite/function-overload-struct/ref/out.txt …e/struct-isomorphic-overload/ref/out.txttestsuite/function-overload-struct/ref/out.txt renamed to testsuite/struct-isomorphic-overload/ref/out.txt testsuite/function-overload-struct/ref/out.txt renamed to testsuite/struct-isomorphic-overload/ref/out.txt

@@ -0,0 +1,42 @@
+// The point of this test is to see what happens when we overload
+// two structs that have the same layout. There was a bug where this
+// got messed up because we distinguished polymorphic args for structs
+// based only on layout. Now we do it on name, but still double check
+// the layout.
+
+struct taco
+{
+    float r;
+    float g;
+};
+
+
+taco __operator__add__(taco c1, taco c2)
+{
+    return taco(c1.r + c2.r, c1.g + c2.g);
+}
+
+
+
+struct cheese
+{
+    float r;
+    float g;
+};
+
+cheese __operator__add__(cheese c1, cheese c2)
+{
+    return cheese(c1.r + c2.r, c1.g + c2.g);
+}
+
+
+
+shader test (
+    taco c2_in_1 = {.1, .1},
+    taco c2_in_2 = {.2, .2},
+    output taco c2_out = {0, 0},
+  )
+{
+    c2_out = c2_in_1 + c2_in_2;
+    printf ("c2_out = %g %g\n", c2_out.r, c2_out.g);
+}

testsuite/function-overload-struct/run.py …tsuite/struct-isomorphic-overload/run.pytestsuite/function-overload-struct/run.py renamed to testsuite/struct-isomorphic-overload/run.py testsuite/function-overload-struct/run.py renamed to testsuite/struct-isomorphic-overload/run.py

@@ -0,0 +1,3 @@
+Compiled test.osl -> test.oso
+c2_out = 0.3 0.3
+

testsuite/struct-isomorphic-overload/test.osl

@@ -0,0 +1,3 @@
+#!/usr/bin/env python
+
+command = testshade("test")