Merge pull request #25 from slangbot/format-6638-cheneym2/dumper

Format code for PR #6638

Author: cheneym2

include/slang.h

@@ -4421,8 +4421,8 @@ struct IModule : public IComponentType
 
     /** Disassemble a module.
      */
-    virtual SLANG_NO_THROW SlangResult SLANG_MCALL disassemble(
-        slang::IBlob** outDisassembledBlob) = 0;    
+    virtual SLANG_NO_THROW SlangResult SLANG_MCALL
+    disassemble(slang::IBlob** outDisassembledBlob) = 0;
 };
 
     #define SLANG_UUID_IModule IModule::getTypeGuid()

source/slang-record-replay/record/slang-module.cpp

@@ -249,7 +249,7 @@ SlangResult ModuleRecorder::disassemble(ISlangBlob** outBlob)
 {
     // No need to record this call as it is just a query.
     slangRecordLog(LogLevel::Verbose, "%s\n", __PRETTY_FUNCTION__);
-    auto res = m_actualModule->disassemble(outBlob);    
+    auto res = m_actualModule->disassemble(outBlob);
     return res;
 }
 } // namespace SlangRecord

source/slang-record-replay/record/slang-module.h

@@ -56,7 +56,8 @@ class ModuleRecorder : public IModuleRecorder, public IComponentTypeRecorder
         ISlangBlob** outDiagnostics) override;
     virtual SLANG_NO_THROW SlangInt32 SLANG_MCALL getDependencyFileCount() override;
     virtual SLANG_NO_THROW char const* SLANG_MCALL getDependencyFilePath(SlangInt32 index) override;
-    virtual SLANG_NO_THROW SlangResult SLANG_MCALL disassemble(slang::IBlob** outDisassembly) override;
+    virtual SLANG_NO_THROW SlangResult SLANG_MCALL
+    disassemble(slang::IBlob** outDisassembly) override;
 
     // Interfaces for `IComponentType`
     virtual SLANG_NO_THROW slang::ISession* SLANG_MCALL getSession() override

source/slang/slang-compiler.h

@@ -1833,18 +1833,17 @@ class Module : public ComponentType, public slang::IModule
     // Source files that have been pulled into the module with `__include`.
     Dictionary<SourceFile*, FileDecl*> m_mapSourceFileToFileDecl;
 
-    public:
-    SLANG_NO_THROW SlangResult SLANG_MCALL disassemble(
-        slang::IBlob** outDisassembledBlob) override
-        {
-            if (!outDisassembledBlob)
-                return SLANG_E_INVALID_ARG;
-            String disassembly;
-            this->getIRModule()->getModuleInst()->dump(disassembly);
-            auto blob = StringUtil::createStringBlob(disassembly);
-            *outDisassembledBlob = blob.detach();
-            return SLANG_OK;
-        }
+public:
+    SLANG_NO_THROW SlangResult SLANG_MCALL disassemble(slang::IBlob** outDisassembledBlob) override
+    {
+        if (!outDisassembledBlob)
+            return SLANG_E_INVALID_ARG;
+        String disassembly;
+        this->getIRModule()->getModuleInst()->dump(disassembly);
+        auto blob = StringUtil::createStringBlob(disassembly);
+        *outDisassembledBlob = blob.detach();
+        return SLANG_OK;
+    }
 };
 typedef Module LoadedModule;
 

source/slang/slang-ir.cpp

@@ -8950,20 +8950,20 @@ void IRInst::addBlock(IRBlock* block)
     block->insertAtEnd(this);
 }
 
-void IRInst::dump(String &outStr)
-{    
-    StringBuilder sb;        
+void IRInst::dump(String& outStr)
+{
+    StringBuilder sb;
 
     if (auto intLit = as<IRIntLit>(this))
     {
         sb << intLit->getValue();
     }
     else if (auto stringLit = as<IRStringLit>(this))
     {
-        sb << stringLit->getStringSlice();            
+        sb << stringLit->getStringSlice();
     }
     else
-    {        
+    {
         IRDumpOptions options;
         StringWriter writer(&sb, Slang::WriterFlag::AutoFlush);
         dumpIR(this, options, nullptr, &writer);

source/slang/slang-ir.h

@@ -819,7 +819,7 @@ struct IRInst
 
     /// Print the IR to a string for debugging purposes.
     ///
-    void dump(String &outStr);
+    void dump(String& outStr);
 
     /// Insert a basic block at the end of this func/code containing inst.
     void addBlock(IRBlock* block);

source/slang/slang-options.cpp

@@ -2953,14 +2953,14 @@ SlangResult OptionsParser::_parse(int argc, char const* const* argv)
         case OptionKind::DumpModule:
             {
                 CommandLineArg fileName;
-                SLANG_RETURN_ON_FAIL(m_reader.expectArg(fileName));                
+                SLANG_RETURN_ON_FAIL(m_reader.expectArg(fileName));
                 auto desc = slang::SessionDesc();
                 ComPtr<slang::ISession> session;
                 m_session->createSession(desc, session.writeRef());
                 ComPtr<slang::IBlob> diagnostics;
 
                 // Coerce Slang to load from the given file, without letting it automatically
-                // choose .slang-module files over .slang files.  
+                // choose .slang-module files over .slang files.
                 // First try to load as source string, and fall back to loading as an IR Blob.
                 // Avoid guessing based on filename or inspect the file contents.
                 FILE* file;
@@ -2973,7 +2973,7 @@ SlangResult OptionsParser::_parse(int argc, char const* const* argv)
                 fseek(file, 0, SEEK_END);
                 size_t size = ftell(file);
                 fseek(file, 0, SEEK_SET);
-                std::vector<char> buffer(size+1);
+                std::vector<char> buffer(size + 1);
                 int result = fread(buffer.data(), 1, size, file);
                 if (result != size)
                 {
@@ -2982,22 +2982,26 @@ SlangResult OptionsParser::_parse(int argc, char const* const* argv)
                 }
                 buffer[size] = 0;
                 fclose(file);
-                
+
                 ComPtr<slang::IModule> module;
-                module = session->loadModuleFromSourceString("module", "path", buffer.data(), diagnostics.writeRef());
+                module = session->loadModuleFromSourceString(
+                    "module",
+                    "path",
+                    buffer.data(),
+                    diagnostics.writeRef());
                 if (!module)
                 {
                     // Load buffer as an IR blob
                     ComPtr<slang::IBlob> blob;
                     blob = RawBlob::create(buffer.data(), size);
-                    
+
                     module = session->loadModuleFromIRBlob(
                         "module",
                         "path",
                         blob,
                         diagnostics.writeRef());
                 }
-                
+
                 if (module)
                 {
                     ComPtr<slang::IBlob> disassemblyBlob;
@@ -3008,7 +3012,9 @@ SlangResult OptionsParser::_parse(int argc, char const* const* argv)
                     }
                     else
                     {
-                        m_sink->diagnoseRaw(Severity::Note, (const char*)disassemblyBlob->getBufferPointer());                        
+                        m_sink->diagnoseRaw(
+                            Severity::Note,
+                            (const char*)disassemblyBlob->getBufferPointer());
                     }
                 }
                 else
@@ -3018,11 +3024,11 @@ SlangResult OptionsParser::_parse(int argc, char const* const* argv)
                         m_sink->diagnoseRaw(
                             Severity::Error,
                             (const char*)diagnostics->getBufferPointer());
-                    }                    
+                    }
                     return SLANG_FAIL;
                 }
-                
-                
+
+
                 break;
             }
         default: