Changeset 62e456f


Ignore:
Timestamp:
Dec 3, 2020, 1:53:23 PM (12 months ago)
Author:
Thierry Delisle <tdelisle@…>
Branches:
arm-eh, jacob/cs343-translation, master, new-ast-unique-expr
Children:
6011658
Parents:
3233b91 (diff), b5629d8 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Files:
4 added
2 edited
10 moved

Legend:

Unmodified
Added
Removed
  • tests/errors/.expect/completeType.oast.arm64.txt

    r3233b91 r62e456f  
    66    Name: x
    77
    8 ... to: nothing Alternatives are:
     8... to: nothing
     9with resolved type:
     10  void  Alternatives are:
    911Cost ( 0, 1, 2, 0, 1, -1, 0 ): Generated Cast of:
    1012      Application of
     
    2022
    2123
     24        with resolved type:
     25          pointer to forall
     26            [unbound]:data type
     27            function
     28          ... with parameters
     29            intrinsic pointer to instance of type [unbound] (not function type)
     30          ... returning
     31            _retval__operator_deref: reference to instance of type [unbound] (not function type)
     32            ... with attributes:
     33              Attribute with name: unused
     34
     35
    2236      ... to arguments
    2337        Variable Expression: x: pointer to instance of struct A with body 0
    24 
     38        with resolved type:
     39          pointer to instance of struct A with body 0
     40
     41      with resolved type:
     42        reference to instance of struct A with body 0
    2543    ... to: nothing
     44    with resolved type:
     45      void
    2646  (types:
    2747    void
    2848  )
    29   Environment: -> instance of struct A with body 0 (no widening)
     49  Environment:([unbound]) -> instance of struct A with body 0 (no widening)
    3050
    3151
     
    4363
    4464
     65        with resolved type:
     66          pointer to forall
     67            [unbound]:data type
     68            function
     69          ... with parameters
     70            intrinsic pointer to instance of type [unbound] (not function type)
     71          ... returning
     72            _retval__operator_deref: reference to instance of type [unbound] (not function type)
     73            ... with attributes:
     74              Attribute with name: unused
     75
     76
    4577      ... to arguments
    4678        Variable Expression: x: pointer to instance of struct B with body 1
    47 
     79        with resolved type:
     80          pointer to instance of struct B with body 1
     81
     82      with resolved type:
     83        reference to instance of struct B with body 1
    4884    ... to: nothing
     85    with resolved type:
     86      void
    4987  (types:
    5088    void
    5189  )
    52   Environment: -> instance of struct B with body 1 (no widening)
     90  Environment:([unbound]) -> instance of struct B with body 1 (no widening)
    5391
    5492
     
    121159            ... returning nothing
    122160
     161            with resolved type:
     162              pointer to forall
     163                [unbound]:sized data type
     164                ... with assertions
     165                  ?=?: pointer to function
     166                  ... with parameters
     167                    reference to instance of type [unbound] (not function type)
     168                    instance of type [unbound] (not function type)
     169                  ... returning
     170                    _retval__operator_assign: instance of type [unbound] (not function type)
     171                    ... with attributes:
     172                      Attribute with name: unused
     173
     174
     175                  ?{}: pointer to function
     176                  ... with parameters
     177                    reference to instance of type [unbound] (not function type)
     178                  ... returning nothing
     179
     180                  ?{}: pointer to function
     181                  ... with parameters
     182                    reference to instance of type [unbound] (not function type)
     183                    instance of type [unbound] (not function type)
     184                  ... returning nothing
     185
     186                  ^?{}: pointer to function
     187                  ... with parameters
     188                    reference to instance of type [unbound] (not function type)
     189                  ... returning nothing
     190
     191
     192                function
     193              ... with parameters
     194                pointer to instance of type [unbound] (not function type)
     195              ... returning nothing
     196
    123197          ... to arguments
    124198            Variable Expression: z: pointer to instance of type T (not function type)
    125 
     199            with resolved type:
     200              pointer to instance of type T (not function type)
     201
     202          with resolved type:
     203            void
    126204        (types:
    127205          void
    128206        )
    129         Environment: -> instance of type T (not function type) (no widening)
     207        Environment:([unbound]) -> instance of type T (not function type) (no widening)
    130208
    131209      Could not satisfy assertion:
    132210?=?: pointer to function
    133211        ... with parameters
    134           reference to instance of type _110_0_T (not function type)
    135           instance of type _110_0_T (not function type)
     212          reference to instance of type [unbound] (not function type)
     213          instance of type [unbound] (not function type)
    136214        ... returning
    137           _retval__operator_assign: instance of type _110_0_T (not function type)
     215          _retval__operator_assign: instance of type [unbound] (not function type)
    138216          ... with attributes:
    139217            Attribute with name: unused
  • tests/meta/.expect/archVast.nast.arm64.txt

    r3233b91 r62e456f  
    33  Name: FA64
    44... to:
     5  char
     6... with resolved type:
    57  char Alternatives are:
    68Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
    79      Variable Expression: FA64: signed int
     10      ... with resolved type:
     11        signed int
    812    ... to:
     13      char
     14    ... with resolved type:
    915      char
    1016  (types:
     
    1824      ... returning nothing
    1925
     26      ... with resolved type:
     27        pointer to function
     28          accepting unspecified arguments
     29        ... returning nothing
     30
    2031    ... to:
     32      char
     33    ... with resolved type:
    2134      char
    2235  (types:
     
    2740Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
    2841      Variable Expression: FA64: double
     42      ... with resolved type:
     43        double
    2944    ... to:
     45      char
     46    ... with resolved type:
    3047      char
    3148  (types:
  • tests/meta/.expect/archVast.oast.arm64.txt

    r3233b91 r62e456f  
    33  Name: FA64
    44... to:
     5  char
     6with resolved type:
    57  char Alternatives are:
    68Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
     
    911      ... returning nothing
    1012
     13      with resolved type:
     14        pointer to function
     15          accepting unspecified arguments
     16        ... returning nothing
     17
    1118    ... to:
     19      char
     20    with resolved type:
    1221      char
    1322  (types:
     
    1827Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
    1928      Variable Expression: FA64: double
     29      with resolved type:
     30        double
    2031    ... to:
     32      char
     33    with resolved type:
    2134      char
    2235  (types:
     
    2740Cost ( 1, 0, 0, 0, 0, 0, 0 ): Explicit Cast of:
    2841      Variable Expression: FA64: signed int
     42      with resolved type:
     43        signed int
    2944    ... to:
     45      char
     46    with resolved type:
    3047      char
    3148  (types:
Note: See TracChangeset for help on using the changeset viewer.