[flang-commits] [flang] d58a405 - [flang] Upstream patch to enable the fir-ops test. bug 45487

[Eric Schweitz via flang-commits]

Author: Eric Schweitz
Date: 2020-04-14T10:02:04-07:00
New Revision: d58a405de656e53424086aa4ab97db56d43deb36

URL: https://github.com/llvm/llvm-project/commit/d58a405de656e53424086aa4ab97db56d43deb36
DIFF: https://github.com/llvm/llvm-project/commit/d58a405de656e53424086aa4ab97db56d43deb36.diff

LOG: [flang] Upstream patch to enable the fir-ops test. bug 45487

Differential revision: https://reviews.llvm.org/D77834

Added: 
    

Modified: 
    flang/include/flang/Optimizer/Dialect/FIROps.td
    flang/test/Fir/fir-ops.fir

Removed: 
    


################################################################################
diff  --git a/flang/include/flang/Optimizer/Dialect/FIROps.td b/flang/include/flang/Optimizer/Dialect/FIROps.td
index 9d503928b25d..19212f10b1c8 100644
--- a/flang/include/flang/Optimizer/Dialect/FIROps.td
+++ b/flang/include/flang/Optimizer/Dialect/FIROps.td
@@ -2467,8 +2467,6 @@ def fir_GlobalOp : fir_Op<"global", [IsolatedFromAbove, Symbol]> {
     TypeAttr:$type
   );
 
-  let results = (outs fir_ReferenceType:$resultType);
-
   let regions = (region AtMostRegion<1>:$region);
 
   let parser = [{
@@ -2508,9 +2506,6 @@ def fir_GlobalOp : fir_Op<"global", [IsolatedFromAbove, Symbol]> {
         return failure();
     }
 
-    auto refTy = AllocaOp::wrapResultType(globalType);
-    if (parser.addTypeToList(refTy, result.types))
-      return failure();
     return success();
   }];
 

diff  --git a/flang/test/Fir/fir-ops.fir b/flang/test/Fir/fir-ops.fir
index 4304d9773853..bdadf5cd6f58 100644
--- a/flang/test/Fir/fir-ops.fir
+++ b/flang/test/Fir/fir-ops.fir
@@ -2,7 +2,6 @@
 
 // RUN: tco -emit-fir %s | tco -emit-fir | FileCheck %s
 // UNSUPPORTED: !fir
-// XFAIL: *
 
 // CHECK-LABEL: func @it1() -> !fir.int<4>
 func @it1() -> !fir.int<4>