Changeset 550e819 for src/SymTab

Timestamp:

Aug 20, 2018, 1:30:04 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

39c4dac

Parents:

0e761e40

Message:

Fix demangling for type variable parameters and temporarily skip demangling functions with assertion parameters

File:

• src/SymTab/Demangle.cc (modified) (2 diffs)

src/SymTab/Demangle.cc ¶

@@ -369 +369 @@
                                 // type variable types
                                 for (size_t k = 0; k < TypeDecl::NUMBER_OF_KINDS; ++k) {
+                                        static const std::string typeVariableNames[] = { "DT", "FT", "TT", };
+                                        static_assert(
+                                                sizeof(typeVariableNames)/sizeof(typeVariableNames[0]) == TypeDecl::NUMBER_OF_KINDS,
+                                                "Each type variable kind should have a demangle name prefix"
+                                        );
                                         parsers.emplace_back(Encoding::typeVariables[k], [k, this](Type::Qualifiers tq) -> TypeInstType * {
                                                 PRINT( std::cerr << "type variable type: " << k << std::endl; )
-                                                std::string name;
-                                                if (! extractName(name)) return nullptr;
-                                                return new TypeInstType(tq, name, (TypeDecl::Kind)k != TypeDecl::Ftype);
+                                                size_t N;
+                                                if (! extractNumber(N)) return nullptr;
+                                                return new TypeInstType(tq, toString(typeVariableNames[k], N), (TypeDecl::Kind)k != TypeDecl::Ftype);
                                         });
                                 }
@@ -541 +546 @@
                                         PRINT( std::cerr << acount << " assertions" << std::endl; )
                                         if (! expect('_')) return nullptr;
-                                        // recursively(?) parse `acount` assertions
+                                        for (size_t i = 0; i < acount; ++i) {
+                                                // TODO: need to recursively parse assertions, but for now just return nullptr so that
+                                                // demangler does not crash if there are assertions
+                                                return nullptr;
+                                        }
                                         if (! expect('_')) return nullptr;
                                 }