remove ifdefs

schweitzpgi · schweitzpgi · commit bf2d407b2b09 · 2021-09-07T14:11:04.000-07:00
diff --git a/flang/lib/Lower/ConvertExpr.cpp b/flang/lib/Lower/ConvertExpr.cpp
@@ -1481,7 +1481,6 @@ class ScalarExprLowering {
           delta = builder.create<mlir::MulIOp>(loc, delta, ext);
         ++dim;
       }
-#if 1
       if (fir::factory::CharacterExprHelper::isCharacterScalar(refTy)) {
         auto chTy = fir::factory::CharacterExprHelper::getCharacterType(refTy);
         if (fir::characterWithDynamicLen(chTy)) {
@@ -1493,7 +1492,6 @@ class ScalarExprLowering {
           base = builder.createConvert(loc, seqRefTy, base);
         }
       }
-#endif
       return builder.create<fir::CoordinateOp>(
           loc, refTy, base, llvm::ArrayRef<mlir::Value>{total});
     };

Original file line number	Diff line number	Diff line change
`@@ -1481,7 +1481,6 @@ class ScalarExprLowering {`
`1481`	`1481`	`delta = builder.create<mlir::MulIOp>(loc, delta, ext);`
`1482`	`1482`	`++dim;`
`1483`	`1483`	`}`
`1484`		`-#if 1`
`1485`	`1484`	`if (fir::factory::CharacterExprHelper::isCharacterScalar(refTy)) {`
`1486`	`1485`	`auto chTy = fir::factory::CharacterExprHelper::getCharacterType(refTy);`
`1487`	`1486`	`if (fir::characterWithDynamicLen(chTy)) {`
`@@ -1493,7 +1492,6 @@ class ScalarExprLowering {`
`1493`	`1492`	`base = builder.createConvert(loc, seqRefTy, base);`
`1494`	`1493`	`}`
`1495`	`1494`	`}`
`1496`		`-#endif`
`1497`	`1495`	`return builder.create<fir::CoordinateOp>(`
`1498`	`1496`	`loc, refTy, base, llvm::ArrayRef<mlir::Value>{total});`
`1499`	`1497`	`};`