xazax.hun added a comment. I tested this patch using http://reviews.llvm.org/D15227 Unfortunately for non-array variables the getDescriptiveName returned var_name[0]. Note the spurious [0] part. Could you look into that? http://reviews.llvm.org/D16044