The ANDMask node folds to a constant, and isn't the node that needs to

have its node id set. The new and and shift nodes are the nodes that need
the IDs. This fixes PR2982.

llvm-svn: 58655