[flang] merge
authorpeter klausler <pklausler@nvidia.com>
Wed, 24 Oct 2018 21:54:53 +0000 (14:54 -0700)
committerpeter klausler <pklausler@nvidia.com>
Fri, 26 Oct 2018 22:19:13 +0000 (15:19 -0700)
commit3f6ae3550f0d7577dd336475d144db1973c114c2
tree8ef857a63ff4081b82db747697e1a56c35cb6989
parenta99e9c99f3e983d6de2a6fab377b6ef922e0ba89
[flang] merge

Original-commit: flang-compiler/f18@d0cd9544f54e8fc841bb16d00841b6ace2f548ad
Reviewed-on: https://github.com/flang-compiler/f18/pull/219
Tree-same-pre-rewrite: false
flang/lib/parser/source.cc
flang/lib/semantics/resolve-names.cc