Fixup

Author: Scheremo

lib/Conversion/MooreToCore/MooreToCore.cpp

@@ -139,29 +139,23 @@ static LogicalResult resolveClassStructBody(ClassDeclOp op,
   if (auto baseClass = op.getBaseAttr()) {
 
     ModuleOp mod = op->getParentOfType<ModuleOp>();
-    // It's possible the base class does not resolve since it materialzes
-    // no methods or properties. In that case we can simply ignore inheritance.
-    if (auto *opSym = mod.lookupSymbol(baseClass)) {
-      auto classDeclOp = dyn_cast<ClassDeclOp>(opSym);
-      if (!classDeclOp)
-        return op.emitError() << "Found symbol corresponding to " << baseClass
-                              << " but it wasn't a classdeclop!";
-
-      if (failed(resolveClassStructBody(classDeclOp, typeConverter, cache)))
-        return failure();
+    auto *opSym = mod.lookupSymbol(baseClass);
+    auto classDeclOp = cast<ClassDeclOp>(opSym);
 
-      // Process base class' struct layout first
-      auto baseClassStruct = cache.getStructInfo(baseClass);
-      structBodyMembers.push_back(baseClassStruct->classBody);
-      derivedStartIdx = 1;
-
-      // Inherit base field paths with a leading 0.
-      for (auto &kv : baseClassStruct->propertyPath) {
-        SmallVector<unsigned, 2> path;
-        path.push_back(0); // into base subobject
-        path.append(kv.second.begin(), kv.second.end());
-        structBody.setFieldPath(kv.first, path);
-      }
+    if (failed(resolveClassStructBody(classDeclOp, typeConverter, cache)))
+      return failure();
+
+    // Process base class' struct layout first
+    auto baseClassStruct = cache.getStructInfo(baseClass);
+    structBodyMembers.push_back(baseClassStruct->classBody);
+    derivedStartIdx = 1;
+
+    // Inherit base field paths with a leading 0.
+    for (auto &kv : baseClassStruct->propertyPath) {
+      SmallVector<unsigned, 2> path;
+      path.push_back(0); // into base subobject
+      path.append(kv.second.begin(), kv.second.end());
+      structBody.setFieldPath(kv.first, path);
     }
   }