Minor fixes and refactors.

- Apply rule-of-three by explicitly deleting copy constructors.

- Fix memory leak in DbgDecoder in case of error by moving fopen to
  constructor and fclose to destructor.

Author: smilczek

visa/DebugInfo.cpp

@@ -237,8 +237,6 @@ void DbgDecoder::ddCalleeCallerSave(uint32_t relocOffset, CallerCallee callCase)
 }
 
 int DbgDecoder::ddDbg() {
-  dbgFile = fopen(filename, "rb");
-
   if (!dbgFile) {
     std::cerr << "Error opening and creating debug file: " << filename << "\n";
     vISA_ASSERT(false, "Unable to write debug file to disk.");
@@ -260,8 +258,6 @@ int DbgDecoder::ddDbg() {
               << " *************"
               << "\n";
 
-    fclose(dbgFile);
-
     return -1;
   }
 
@@ -453,8 +449,6 @@ int DbgDecoder::ddDbg() {
 
   std::cout << "=== End of Debug Dump ===\n";
 
-  fclose(dbgFile);
-
   return 0;
 }
 

visa/DebugInfo.h

@@ -468,10 +468,20 @@ class DbgDecoder {
 
 public:
   DbgDecoder(const char *f, TARGET_PLATFORM platform) : filename(f) {
+    dbgFile = fopen(filename, "rb");
     platInfo = PlatformInfo::LookupPlatformInfo(platform);
     vISA_ASSERT(platInfo != nullptr, "failed to look up platform");
   }
 
+  ~DbgDecoder() {
+    if (dbgFile)
+      fclose(dbgFile);
+  }
+
+  DbgDecoder() = delete;
+  DbgDecoder(const DbgDecoder &) = delete;
+  DbgDecoder operator=(const DbgDecoder &) = delete;
+
   int ddDbg();
 };
 

visa/Passes/SRSubstitution.hpp

@@ -32,12 +32,9 @@ struct regMap {
   unsigned short dstReg;
   unsigned short srcReg;
 
-  regMap() : localID(-1), dstReg(-1), srcReg(-1) { ; }
+  regMap() : localID(-1), dstReg(-1), srcReg(-1) {}
   regMap(unsigned int id, unsigned short dst, unsigned src)
-      : localID(id), dstReg(dst), srcReg(src) {
-    ;
-  }
-  ~regMap() {}
+      : localID(id), dstReg(dst), srcReg(src) {}
 };
 
 struct regMapBRA {
@@ -46,14 +43,9 @@ struct regMapBRA {
   unsigned int offset = 0;
   G4_Operand *opnd = nullptr;
 
-  regMapBRA() {}
-
   regMapBRA(G4_INST *i, Gen4_Operand_Number n, unsigned int off,
             G4_Operand *src)
-      : inst(i), opndNum(n), offset(off), opnd(src) {
-    ;
-  }
-  ~regMapBRA() {}
+      : inst(i), opndNum(n), offset(off), opnd(src) {}
 };
 
 struct regCandidates {
@@ -83,8 +75,6 @@ class SRSubPassAfterRA {
   }
   SRSubPassAfterRA(const SRSubPassAfterRA &) = delete;
   SRSubPassAfterRA& operator=(const SRSubPassAfterRA&) = delete;
-  ~SRSubPassAfterRA() {
-  };
 
   void run() {
     for (auto bb : kernel.fg) {