move a member var to the base class
Fixed one more crash

check the validity of source range before rewriting