[ILASM] Added /DET flag for deterministic compilations

src/coreclr/dlls/mscorpe/pewriter.cpp

@@ -618,6 +618,11 @@ HRESULT PEWriter::Init(PESectionMan *pFrom, DWORD createFlags)
         m_ntHeaders->FileHeader.Characteristics |= VAL16(IMAGE_FILE_RELOCS_STRIPPED);
     }
 
+    if (createFlags & ICEE_CREATE_FILE_DET)
+    {
+        m_ntHeaders->FileHeader.TimeDateStamp = VAL32(0);
+    }
+
     // Linker version should be consistent with current VC level
     m_ntHeaders->OptionalHeader.MajorLinkerVersion  = 11;
     m_ntHeaders->OptionalHeader.MinorLinkerVersion  = 0;

src/coreclr/ilasm/assem.cpp

@@ -28,6 +28,7 @@ Assembler::Assembler()
 {
     m_pDisp = NULL;
     m_pEmitter = NULL;
+    m_pInternalEmitForDeterministicMvid = NULL;
     m_pImporter = NULL;
 
     char* pszFQN = new char[16];
@@ -107,6 +108,7 @@ Assembler::Assembler()
     m_fGeneratePDB = FALSE;
     m_fIsMscorlib = FALSE;
     m_fOptimize = FALSE;
+    m_fDeterministic = FALSE;
     m_tkSysObject = 0;
     m_tkSysString = 0;
     m_tkSysValue = 0;
@@ -207,6 +209,11 @@ Assembler::~Assembler()
         m_pEmitter->Release();
         m_pEmitter = NULL;
     }
+    if (m_pInternalEmitForDeterministicMvid != NULL)
+    {
+        m_pInternalEmitForDeterministicMvid->Release();
+        m_pInternalEmitForDeterministicMvid = NULL;
+    }
     if (m_pPortablePdbWriter != NULL)
     {
         delete m_pPortablePdbWriter;
@@ -233,6 +240,11 @@ BOOL Assembler::Init(BOOL generatePdb)
 
     if (FAILED(CreateICeeFileGen(&m_pCeeFileGen))) return FALSE;
 
+    if (m_fDeterministic)
+    {
+        m_dwCeeFileFlags |= ICEE_CREATE_FILE_DET;
+    }
+
     if (FAILED(m_pCeeFileGen->CreateCeeFileEx(&m_pCeeFile,(ULONG)m_dwCeeFileFlags))) return FALSE;
 
     if (FAILED(m_pCeeFileGen->GetSectionCreate(m_pCeeFile, ".il", sdReadOnly, &m_pILSection))) return FALSE;

src/coreclr/ilasm/assembler.cpp

@@ -2434,13 +2434,10 @@ void Assembler::SetPdbFileName(_In_ __nullterminated char* szName)
 HRESULT Assembler::SavePdbFile()
 {
     HRESULT hr = S_OK;
-    mdMethodDef entryPoint;
 
     if (FAILED(hr = (m_pPortablePdbWriter == NULL ? E_FAIL : S_OK))) goto exit;
     if (FAILED(hr = (m_pPortablePdbWriter->GetEmitter() == NULL ? E_FAIL : S_OK))) goto exit;
-    if (FAILED(hr = m_pCeeFileGen->GetEntryPoint(m_pCeeFile, &entryPoint))) goto exit;
-    if (FAILED(hr = m_pPortablePdbWriter->BuildPdbStream(m_pEmitter, entryPoint))) goto exit;
-    if (FAILED(hr = m_pPortablePdbWriter->GetEmitter()->Save(m_wzPdbFileName, 0))) goto exit;
+    if (FAILED(hr = m_pPortablePdbWriter->GetEmitter()->Save(m_wzPdbFileName, NULL))) goto exit;
 
 exit:
     return hr;

src/coreclr/ilasm/assembler.h

@@ -752,6 +752,7 @@ class Assembler {
     BOOL    m_fIsMscorlib;
     BOOL    m_fTolerateDupMethods;
     BOOL    m_fOptimize;
+    BOOL    m_fDeterministic;
     mdToken m_tkSysObject;
     mdToken m_tkSysString;
     mdToken m_tkSysValue;
@@ -760,6 +761,7 @@ class Assembler {
 
     IMetaDataDispenserEx2 *m_pDisp;
     IMetaDataEmit3      *m_pEmitter;
+    IMDInternalEmit     *m_pInternalEmitForDeterministicMvid;
     ICeeFileGen        *m_pCeeFileGen;
     IMetaDataImport2    *m_pImporter;			// Import interface.
     HCEEFILE m_pCeeFile;
@@ -845,7 +847,7 @@ class Assembler {
     BOOL EmitClass(Class *pClass);
     HRESULT CreatePEFile(_In_ __nullterminated WCHAR *pwzOutputFilename);
     HRESULT CreateTLSDirectory();
-    HRESULT CreateDebugDirectory();
+    HRESULT CreateDebugDirectory(BYTE(&pdbChecksum)[32]);
     HRESULT InitMetaData();
     Class *FindCreateClass(_In_ __nullterminated const char *pszFQN);
     BOOL EmitFieldRef(_In_z_ char *pszArg, int opcode);

src/coreclr/ilasm/main.cpp

@@ -315,6 +315,10 @@ extern "C" int _cdecl wmain(int argc, _In_ WCHAR **argv)
                     {
                       pAsm->m_fOptimize = TRUE;
                     }
+                    else if (!_stricmp(szOpt, "DET"))
+                    {
+                      pAsm->m_fDeterministic = TRUE;
+                    }
                     else if (!_stricmp(szOpt, "X64"))
                     {
                       pAsm->m_dwCeeFileFlags &= ~ICEE_CREATE_MACHINE_MASK;

src/coreclr/ilasm/portable_pdb.cpp

@@ -101,6 +101,10 @@ HRESULT PortablePdbWriter::Init(IMetaDataDispenserEx2* mdDispenser)
         0,
         IID_IMetaDataEmit3,
         (IUnknown**)&m_pdbEmitter);
+
+    if (FAILED(hr)) goto exit;
+
+    hr = m_pdbEmitter->QueryInterface(IID_IILAsmPortablePdbWriter, (void**)&m_ilasmPdbWriter);
 exit:
     return hr;
 }
@@ -120,6 +124,16 @@ ULONG PortablePdbWriter::GetTimestamp()
     return m_pdbStream.id.pdbTimeStamp;
 }
 
+void PortablePdbWriter::SetGuid(REFGUID newGuid)
+{
+    m_pdbStream.id.pdbGuid = newGuid;
+}
+
+void PortablePdbWriter::SetTimestamp(const ULONG newTimestamp)
+{
+    m_pdbStream.id.pdbTimeStamp = newTimestamp;
+}
+
 Document* PortablePdbWriter::GetCurrentDocument()
 {
     return m_currentDocument;
@@ -143,6 +157,17 @@ HRESULT PortablePdbWriter::BuildPdbStream(IMetaDataEmit3* peEmitter, mdMethodDef
     return hr;
 }
 
+HRESULT PortablePdbWriter::ComputeSha256PdbStreamChecksum(BYTE(&checksum)[32])
+{
+    return m_ilasmPdbWriter->ComputeSha256PdbStreamChecksum(checksum);
+}
+
+HRESULT PortablePdbWriter::ChangePdbStreamGuid(REFGUID newGuid)
+{
+    m_pdbStream.id.pdbGuid = newGuid;
+    return m_ilasmPdbWriter->ChangePdbStreamGuid(newGuid);
+}
+
 HRESULT PortablePdbWriter::DefineDocument(char* name, GUID* language)
 {
     HRESULT hr = S_OK;

src/coreclr/ilasm/portable_pdb.h

@@ -46,8 +46,12 @@ class PortablePdbWriter
     IMetaDataEmit3* GetEmitter();
     GUID*           GetGuid();
     ULONG           GetTimestamp();
+    void            SetGuid(REFGUID newGuid);
+    void            SetTimestamp(const ULONG newTimestamp);
     Document*       GetCurrentDocument();
     HRESULT         BuildPdbStream(IMetaDataEmit3* peEmitter, mdMethodDef entryPoint);
+    HRESULT         ComputeSha256PdbStreamChecksum(BYTE (&checksum)[32]);
+    HRESULT         ChangePdbStreamGuid(REFGUID newGuid);
     HRESULT         DefineDocument(char* name, GUID* language);
     HRESULT         DefineSequencePoints(Method* method);
     HRESULT         DefineLocalScope(Method* method);
@@ -59,10 +63,11 @@ class PortablePdbWriter
     BOOL            _DefineLocalScope(mdMethodDef methodDefToken, Scope* currScope);
 
 private:
-    IMetaDataEmit3* m_pdbEmitter;
-    PORT_PDB_STREAM m_pdbStream;
-    DocumentList    m_documentList;
-    Document*       m_currentDocument;
+    IMetaDataEmit3*          m_pdbEmitter;
+    IILAsmPortablePdbWriter* m_ilasmPdbWriter;
+    PORT_PDB_STREAM          m_pdbStream;
+    DocumentList             m_documentList;
+    Document*                m_currentDocument;
 };
 
 #endif