diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-10 11:03:29 +0000 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2015-03-10 14:51:11 +0000 |
commit | 0aa50ce2fb75bfc2e815a0c33adf9b049561923b (patch) | |
tree | 9a3f9603ab30d5cbc7fc21aee0ceb48bbb0dd25a /runtime/monitor.cc | |
parent | e8e42f3548fd894f860912bb1b71ce6fa2d7daf3 (diff) | |
download | art-0aa50ce2fb75bfc2e815a0c33adf9b049561923b.zip art-0aa50ce2fb75bfc2e815a0c33adf9b049561923b.tar.gz art-0aa50ce2fb75bfc2e815a0c33adf9b049561923b.tar.bz2 |
Remove ThrowLocation.
Note that this is a cleanup change, and has no functionality change.
The ThrowLocation had no use anymore.
Change-Id: I3d2126af1dc673cec3a0453ff3d56a172663a5f6
Diffstat (limited to 'runtime/monitor.cc')
-rw-r--r-- | runtime/monitor.cc | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/runtime/monitor.cc b/runtime/monitor.cc index dce8bac..d41d37e 100644 --- a/runtime/monitor.cc +++ b/runtime/monitor.cc @@ -300,8 +300,7 @@ static void ThrowIllegalMonitorStateExceptionF(const char* fmt, ...) va_list args; va_start(args, fmt); Thread* self = Thread::Current(); - ThrowLocation throw_location = self->GetCurrentLocationForThrow(); - self->ThrowNewExceptionV(throw_location, "Ljava/lang/IllegalMonitorStateException;", fmt, args); + self->ThrowNewExceptionV("Ljava/lang/IllegalMonitorStateException;", fmt, args); if (!Runtime::Current()->IsStarted() || VLOG_IS_ON(monitor)) { std::ostringstream ss; self->Dump(ss); @@ -428,8 +427,7 @@ void Monitor::Wait(Thread* self, int64_t ms, int32_t ns, // Enforce the timeout range. if (ms < 0 || ns < 0 || ns > 999999) { monitor_lock_.Unlock(self); - ThrowLocation throw_location = self->GetCurrentLocationForThrow(); - self->ThrowNewExceptionF(throw_location, "Ljava/lang/IllegalArgumentException;", + self->ThrowNewExceptionF("Ljava/lang/IllegalArgumentException;", "timeout arguments out of range: ms=%" PRId64 " ns=%d", ms, ns); return; } @@ -540,8 +538,7 @@ void Monitor::Wait(Thread* self, int64_t ms, int32_t ns, self->SetInterruptedLocked(false); } if (interruptShouldThrow) { - ThrowLocation throw_location = self->GetCurrentLocationForThrow(); - self->ThrowNewException(throw_location, "Ljava/lang/InterruptedException;", NULL); + self->ThrowNewException("Ljava/lang/InterruptedException;", NULL); } } } |