[flang] done with merge
authorpeter klausler <pklausler@nvidia.com>
Fri, 18 Jan 2019 00:14:36 +0000 (16:14 -0800)
committerpeter klausler <pklausler@nvidia.com>
Fri, 18 Jan 2019 00:14:36 +0000 (16:14 -0800)
commit5ceaa14dd96407e32617bdd7c8a1c6a04d901b7d
tree66a52281b47b029ee90b71e8837dee34393fe096
parent7f3590771e0de221a0028cf6cdd03b599db18415
[flang] done with merge

Original-commit: flang-compiler/f18@9c63eb7a1a87bcd075938b4ec93a45ef5bd4c1bf
Reviewed-on: https://github.com/flang-compiler/f18/pull/260
Tree-same-pre-rewrite: false
flang/lib/semantics/resolve-names.cc
flang/lib/semantics/symbol.cc
flang/lib/semantics/symbol.h
flang/test/semantics/resolve37.f90
flang/test/semantics/symbol11.f90