Merge pull request #991 from flang-compiler/jpr-add-lines-in-error

Add line information to some fatal errors to help debugging

Author: jeanPerier

flang/lib/Lower/ConvertExpr.cpp

@@ -1680,15 +1680,11 @@ class ScalarExprLowering {
     // Explicitly map statement function host associated symbols to their
     // parent scope lowered symbol box.
     for (const Fortran::semantics::SymbolRef &sym :
-         Fortran::evaluate::CollectSymbols(*details.stmtFunction())) {
+         Fortran::evaluate::CollectSymbols(*details.stmtFunction()))
       if (const auto *details =
-              sym->detailsIf<Fortran::semantics::HostAssocDetails>()) {
-        if (!symMap.lookupSymbol(*sym)) {
-          symMap.addSymbol(
-              *sym, symMap.lookupSymbol(details->symbol()).toExtendedValue());
-        }
-      }
-    }
+              sym->detailsIf<Fortran::semantics::HostAssocDetails>())
+        if (!symMap.lookupSymbol(*sym))
+          symMap.addSymbol(*sym, gen(details->symbol()));
 
     auto result = genval(details.stmtFunction().value());
     LLVM_DEBUG(llvm::dbgs() << "stmt-function: " << result << '\n');

flang/lib/Optimizer/CodeGen/CodeGen.cpp

@@ -2248,15 +2248,17 @@ struct CoordinateOpConversion
   }
 
   int64_t getIntValue(mlir::Value val) const {
-    if (val)
+    if (val) {
       if (auto defop = val.getDefiningOp()) {
         if (auto constOp = dyn_cast<mlir::ConstantIntOp>(defop))
           return constOp.getValue();
         else if (auto llConstOp = dyn_cast<mlir::LLVM::ConstantOp>(defop))
           if (auto attr = llConstOp.value().dyn_cast<mlir::IntegerAttr>())
             return attr.getValue().getSExtValue();
       }
-    llvm_unreachable("must be a constant");
+      fir::emitFatalError(val.getLoc(), "must be a constant");
+    }
+    llvm_unreachable("must not be null value");
   }
 }; // namespace