Skip to content

Commit 06e7ee6

Browse files
authored
Merge pull request #40252 from JuliaLang/tb/merge_nonconst_globals
Reinstate support for merging modules with non-const globals.
2 parents 0e3fab6 + d0ab30b commit 06e7ee6

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

src/jitlayers.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -944,8 +944,7 @@ void jl_merge_module(Module *dest, std::unique_ptr<Module> src)
944944
// continue;
945945
//}
946946
else {
947-
assert(dG->isDeclaration() || (dG->getInitializer() == sG->getInitializer() &&
948-
dG->isConstant() && sG->isConstant()));
947+
assert(dG->isDeclaration() || dG->getInitializer() == sG->getInitializer());
949948
dG->replaceAllUsesWith(sG);
950949
dG->eraseFromParent();
951950
}

0 commit comments

Comments
 (0)