Use return pointers from fromConstInitializer in CmpExp-visitor

Went missing after refactoring operation in 0215b469. Instead input
argument e member variables e1/e2 were used.
Merge pull request #3619 from andron/visitor-refactor-fix

Visitor refactor fix