Merge branch 'v3.1new' into v3.4new

Ignore the Giri Constructor when instrumentBB

In the Giri Constructor, i.e. giriCtor() function, it is not set up yet
so we don't need to call instrumentBB(). Actually, it's undefined
behavior if we do so. Some machines work fine while the others
(e.g. Ubuntu) don't. Hopefully, this patch fixes liuml07#2.