Use an lvalue and apply op

Author: Jaddyen

mlir/include/mlir/Dialect/EmitC/IR/EmitC.td

@@ -1267,8 +1267,7 @@ def EmitC_GetGlobalOp : EmitC_Op<"get_global",
   }];
 
   let arguments = (ins FlatSymbolRefAttr:$name);
-  let results = (outs AnyTypeOf<[EmitC_ArrayType, EmitC_LValueType,
-                                 EmitC_PointerType]>:$result);
+  let results = (outs AnyTypeOf<[EmitC_ArrayType, EmitC_LValueType]>:$result);
   let assemblyFormat = "$name `:` type($result) attr-dict";
 }
 
@@ -1687,8 +1686,7 @@ def EmitC_GetFieldOp
   }];
 
   let arguments = (ins FlatSymbolRefAttr:$field_name);
-  let results = (outs AnyTypeOf<[EmitC_ArrayType, EmitC_LValueType,
-                                 EmitC_PointerType]>:$result);
+  let results = (outs AnyTypeOf<[EmitC_ArrayType, EmitC_LValueType]>:$result);
   let assemblyFormat = "$field_name `:` type($result) attr-dict";
 }
 

mlir/lib/Conversion/MemRefToEmitC/MemRefToEmitC.cpp

@@ -152,13 +152,21 @@ struct ConvertGetGlobal final
 
     MemRefType opTy = op.getType();
     Type resultTy = convertMemRefType(opTy, getTypeConverter());
-    if (opTy.getRank() == 0)
-      resultTy = emitc::PointerType::get(resultTy);
 
     if (!resultTy) {
       return rewriter.notifyMatchFailure(op.getLoc(),
                                          "cannot convert result type");
     }
+
+    if (opTy.getRank() == 0) {
+      auto lvalueType = emitc::LValueType::get(resultTy);
+      auto globalLValue = rewriter.create<emitc::GetGlobalOp>(
+          op.getLoc(), lvalueType, operands.getNameAttr());
+      auto pointerType = emitc::PointerType::get(resultTy);
+      rewriter.replaceOpWithNewOp<emitc::ApplyOp>(
+          op, pointerType, rewriter.getStringAttr("&"), globalLValue);
+      return success();
+    }
     rewriter.replaceOpWithNewOp<emitc::GetGlobalOp>(op, resultTy,
                                                     operands.getNameAttr());
     return success();

mlir/lib/Dialect/EmitC/IR/EmitC.cpp

@@ -1248,15 +1248,6 @@ GetGlobalOp::verifySymbolUses(SymbolTableCollection &symbolTable) {
   }
 
   // global has non-array type
-  if (auto pointerType = llvm::dyn_cast<PointerType>(resultType)) {
-    if (pointerType.getPointee() != globalType) {
-      return emitOpError("on pointer type expects result pointee type ")
-             << pointerType.getPointee() << " to match type " << globalType
-             << " of the global @" << getName();
-    }
-    return success();
-  }
-
   auto lvalueType = dyn_cast<LValueType>(resultType);
   if (!lvalueType || lvalueType.getValueType() != globalType)
     return emitOpError("on non-array type expects result inner type ")