Changeset 0f9e4403 for src/ResolvExpr/PtrsCastable.cc

Timestamp:

Apr 15, 2016, 12:03:11 PM (10 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

29ad0ac

Parents:

c5833e8 (diff), 37f0da8 (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' into gc_noraii

File:

• src/ResolvExpr/PtrsCastable.cc (modified) (5 diffs)

src/ResolvExpr/PtrsCastable.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Sun May 17 11:48:00 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Mon Oct 05 14:49:12 2015
-// Update Count     : 7
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Mar  2 17:36:18 2016
+// Update Count     : 8
 //
 
@@ -36 +36 @@
                 virtual void visit(UnionInstType *inst);
                 virtual void visit(EnumInstType *inst);
-                virtual void visit(ContextInstType *inst);
+                virtual void visit(TraitInstType *inst);
                 virtual void visit(TypeInstType *inst);
                 virtual void visit(TupleType *tupleType);
+                virtual void visit(VarArgsType *varArgsType);
           private:
                 Type *dest;
@@ -115 +116 @@
 
         void PtrsCastable::visit(EnumInstType *inst) {
-                if ( dynamic_cast< EnumInstType* >( inst ) ) {
+                if ( dynamic_cast< EnumInstType* >( dest ) ) {
                         result = 1;
-                } else if ( BasicType *bt = dynamic_cast< BasicType* >( inst ) ) {
+                } else if ( BasicType *bt = dynamic_cast< BasicType* >( dest ) ) {
                         if ( bt->get_kind() == BasicType::SignedInt ) {
                                 result = 0;
@@ -128 +129 @@
         }
 
-        void PtrsCastable::visit(ContextInstType *inst) {
+        void PtrsCastable::visit(TraitInstType *inst) {
                 // I definitely don't think we should be doing anything here
         }
@@ -139 +140 @@
                 result = objectCast( dest, env, indexer );
         }
+
+        void PtrsCastable::visit(VarArgsType *varArgsType) {
+                result = objectCast( dest, env, indexer );
+        }
 } // namespace ResolvExpr