en Copyright 2015 Java http://172.16.0.5:8080/history/llvm-project-15.0.7/clang/test/Modules/Inputs/PR28752/module.modulemap#edbc6e93 Reinstate r284008 reverted in r284081, with two fixes:1) Merge and demote variable definitions when we find a redefinition inMergeVarDecls, not only when we find one in AddInitializerToDecl (we only reachthe second case if it's the addition of the initializer itself that converts anexisting declaration into a definition). 2) When rebuilding a redeclaration chain for a variable, if we merge twodefinitions together, mark the definitions as merged so the retained definitionis made visible whenever the demoted definition would have been.Original commit message (from r283882):[modules] PR28752: Do not instantiate variable declarations which are not visible.Original patch by Vassil Vassilev! Changes listed above are mine.llvm-svn: 284284 List of files: /llvm-project-15.0.7/clang/test/Modules/Inputs/PR28752/module.modulemap Fri, 14 Oct 2016 21:41:24 +0000 Richard Smith <richard-llvm@metafoo.co.uk> http://172.16.0.5:8080/history/llvm-project-15.0.7/clang/test/Modules/Inputs/PR28752/module.modulemap#bb8fe317 Reinstate r283887 and r283882.Original message:"[modules] PR28752: Do not instantiate variable declarations which are not visible.https://reviews.llvm.org/D24508Patch developed in collaboration with Richard Smith!"llvm-svn: 284008 List of files: /llvm-project-15.0.7/clang/test/Modules/Inputs/PR28752/module.modulemap Wed, 12 Oct 2016 11:57:08 +0000 Vassil Vassilev <v.g.vassilev@gmail.com> http://172.16.0.5:8080/history/llvm-project-15.0.7/clang/test/Modules/Inputs/PR28752/module.modulemap#4b3e7388 [modules] PR28752: Do not instantiate variable declarations which are not visible.https://reviews.llvm.org/D24508Patch developed in collaboration with Richard Smith!llvm-svn: 283882 List of files: /llvm-project-15.0.7/clang/test/Modules/Inputs/PR28752/module.modulemap Tue, 11 Oct 2016 13:57:36 +0000 Vassil Vassilev <v.g.vassilev@gmail.com>