Skip to content

Commit

Permalink
[Local GC] Fix a bad merge (dotnet#10748)
Browse files Browse the repository at this point in the history
  • Loading branch information
swgillespie authored Apr 6, 2017
1 parent 87ae15c commit f9d0333
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 7 deletions.
1 change: 0 additions & 1 deletion src/gc/env/gcenv.ee.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,6 @@ class GCToEEInterface
static void HandleFatalError(unsigned int exitCode);
static bool ShouldFinalizeObjectForUnload(AppDomain* pDomain, Object* obj);
static bool ForceFullGCToBeBlocking();
static bool ShouldElevateForAppDomainCleanup();
static bool EagerFinalized(Object* obj);
};

Expand Down
5 changes: 0 additions & 5 deletions src/gc/gcinterface.ee.h
Original file line number Diff line number Diff line change
Expand Up @@ -143,11 +143,6 @@ class IGCToCLR {
virtual
bool ShouldFinalizeObjectForUnload(AppDomain* pDomain, Object* obj) = 0;

// Asks the EE if the GC scheduled for the given condemned generation should be
// elevated to a blocking collection, to clean up an app domain.
virtual
bool ShouldElevateForAppDomainCleanup() = 0;

// Offers the EE the option to finalize the given object eagerly, i.e.
// not on the finalizer thread but on the current thread. The
// EE returns true if it finalized the object eagerly and the GC does not
Expand Down
1 change: 0 additions & 1 deletion src/vm/gcenv.ee.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class GCToEEInterface : public IGCToCLR {
void EnableFinalization(bool foundFinalizers);
void HandleFatalError(unsigned int exitCode);
bool ShouldFinalizeObjectForUnload(AppDomain* pDomain, Object* obj);
bool ShouldElevateForAppDomainCleanup();
bool ForceFullGCToBeBlocking();
bool EagerFinalized(Object* obj);
};
Expand Down

0 comments on commit f9d0333

Please sign in to comment.