Improve insufficient import error message

Error message is more verbose with module name, field name and type of import.

Signed-off-by: Ádám László Kulcsár <[email protected]>

Author: kulcsaradam

src/runtime/Module.cpp

@@ -153,7 +153,12 @@ Instance* Module::instantiate(ExecutionState& state, const ExternVector& imports
     }
 
     if (imports.size() < m_imports.size()) {
-        Trap::throwException(state, "Insufficient import");
+        std::string message = "Insufficient import(s):\n";
+
+        for (uint32_t i = imports.size(); i < m_imports.size(); i++) {
+            message.append("  " + m_imports[i]->moduleName() + " : " + m_imports[i]->fieldName() + " -- Type:" + m_imports[i]->typeToString() + "\n");
+        }
+        Trap::throwException(state, message);
     }
 
     for (size_t i = 0; i < m_imports.size(); i++) {

src/runtime/Module.h

@@ -131,6 +131,29 @@ class ImportType {
         return static_cast<const MemoryType*>(m_type);
     }
 
+    std::string typeToString()
+    {
+        switch (m_importType) {
+        case Type::Function: {
+            return std::string("Function");
+        }
+        case Type::Global: {
+            return std::string("Global");
+        }
+        case Type::Memory: {
+            return std::string("Memory");
+        }
+        case Type::Table: {
+            return std::string("Table");
+        }
+        case Type::Tag: {
+            return std::string("Tag");
+        }
+        }
+
+        RELEASE_ASSERT_NOT_REACHED();
+    }
+
 private:
     Type m_importType;
     std::string m_moduleName;