revert change to needsToMaterialize()

schweitzpgi · schweitzpgi · commit 65b67cb25d8e · 2020-06-30T19:18:28.000-07:00
diff --git a/flang/lib/Lower/CharacterExpr.cpp b/flang/lib/Lower/CharacterExpr.cpp
@@ -35,11 +35,8 @@ static fir::CharacterType getCharacterType(const fir::CharBoxValue &box) {
 }
 
 static bool needToMaterialize(const fir::CharBoxValue &box) {
-  auto buffTy = box.getBuffer().getType();
-  if (auto seqTy = buffTy.dyn_cast<fir::SequenceType>())
-    if (seqTy.getShape().size() == 1)
-      buffTy = seqTy.getEleTy();
-  return buffTy.isa<fir::CharacterType>();
+  return box.getBuffer().getType().isa<fir::SequenceType>() ||
+         box.getBuffer().getType().isa<fir::CharacterType>();
 }
 
 static std::optional<fir::SequenceType::Extent>

Original file line number	Diff line number	Diff line change
`@@ -35,11 +35,8 @@ static fir::CharacterType getCharacterType(const fir::CharBoxValue &box) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`static bool needToMaterialize(const fir::CharBoxValue &box) {`
`38`		`- auto buffTy = box.getBuffer().getType();`
`39`		`- if (auto seqTy = buffTy.dyn_cast<fir::SequenceType>())`
`40`		`- if (seqTy.getShape().size() == 1)`
`41`		`- buffTy = seqTy.getEleTy();`
`42`		`- return buffTy.isa<fir::CharacterType>();`
	`38`	`+ return box.getBuffer().getType().isa<fir::SequenceType>() \|\|`
	`39`	`+ box.getBuffer().getType().isa<fir::CharacterType>();`
`43`	`40`	`}`
`44`	`41`
`45`	`42`	`static std::optional<fir::SequenceType::Extent>`