Really fix CHECK-LABEL and CHECK-DAG interaction. This actually just restores...

Really fix CHECK-LABEL and CHECK-DAG interaction. This actually just restores the initial implementation that was in r186162 but got lost in some subsequent refactoring. More explicit variable names and comments are present now to hopefully prevent repeat regression, as well as another test.

llvm-svn: 192477