Address more comments

Author: Sterling-Augustine

llvm/lib/MC/MCSFrame.cpp

@@ -145,8 +145,7 @@ class SFrameEmitterImpl {
     case MCCFIInstruction::OpLLVMDefAspaceCfa:
       if (!setCFARegister(FRE, CFI))
         return false;
-      setCFAOffset(FRE, CFI.getLoc(), CFI.getOffset());
-      return true;
+      return setCFAOffset(FRE, CFI.getLoc(), CFI.getOffset());
     case MCCFIInstruction::OpOffset:
       if (CFI.getRegister() == FPReg)
         FRE.FPOffset = CFI.getOffset();
@@ -250,9 +249,12 @@ class SFrameEmitterImpl {
     FDE.FREs.push_back(BaseFRE);
 
     for (const auto &CFI : DF.Instructions) {
-      // Instructions from InitialFrameState may not have a label, but if
-      // these instructions don't, then they are in dead code or otherwise
-      // unused.
+      // Instructions from InitialFrameState may not have a label, but if these
+      // instructions don't, then they are in dead code or otherwise unused.
+      // TODO: This check follows MCDwarf.cpp
+      // FrameEmitterImplementation::emitCFIInstructions, but nothing in the
+      // testsuite triggers it. We should see if it can be removed in both
+      // places, or alternately, add a test to exercise it.
       auto *L = CFI.getLabel();
       if (L && !L->isDefined())
         continue;

llvm/test/MC/ELF/cfi-sframe-errors.s

@@ -8,21 +8,21 @@
 f1:
 	.cfi_startproc simple
 // CHECK: Non-default RA register {{.*}}
-	.cfi_return_column 0
+        .cfi_return_column 0
 	nop
 // CHECK: {{.*}} Adjusting CFA offset without a base register.{{.*}}
-	.cfi_def_cfa_offset 16 // no line number reported here.
+        .cfi_def_cfa_offset 16 // no line number reported here.
 	nop
 // CHECK: [[@LINE+1]]:{{.*}} Adjusting CFA offset without a base register.{{.*}}
-	.cfi_adjust_cfa_offset 16
+        .cfi_adjust_cfa_offset 16
 	nop
-	.cfi_endproc
+        .cfi_endproc
 
 f2:	
-	.cfi_startproc
+        .cfi_startproc
 	nop
 // CHECK: Canonical Frame Address not in stack- or frame-pointer. {{.*}}
-	.cfi_def_cfa 0, 4
+        .cfi_def_cfa 0, 4
 	nop
 
         .cfi_endproc