Commit 1d7c30b2 authored by Yedidya Feldblum's avatar Yedidya Feldblum Committed by Facebook Github Bot

Outline the throw statements in Try

Summary:
[Folly] Outline the `throw` statements in `Try`.

They are by definition cold and so we gain nothing from inlining them.

Reviewed By: Orvid

Differential Revision: D5478237

fbshipit-source-id: f413251a56ca4cbddcf3baea6679a552ae5bb19e
parent b3698ed4
...@@ -561,6 +561,7 @@ libfolly_la_SOURCES = \ ...@@ -561,6 +561,7 @@ libfolly_la_SOURCES = \
ThreadCachedArena.cpp \ ThreadCachedArena.cpp \
ThreadName.cpp \ ThreadName.cpp \
TimeoutQueue.cpp \ TimeoutQueue.cpp \
Try.cpp \
Uri.cpp \ Uri.cpp \
Version.cpp \ Version.cpp \
experimental/AsymmetricMemoryBarrier.cpp \ experimental/AsymmetricMemoryBarrier.cpp \
......
...@@ -117,12 +117,13 @@ const T& Try<T>::value() const & { ...@@ -117,12 +117,13 @@ const T& Try<T>::value() const & {
template <class T> template <class T>
void Try<T>::throwIfFailed() const { void Try<T>::throwIfFailed() const {
if (contains_ != Contains::VALUE) { switch (contains_) {
if (contains_ == Contains::EXCEPTION) { case Contains::VALUE:
return;
case Contains::EXCEPTION:
e_.throw_exception(); e_.throw_exception();
} else { default:
throw UsingUninitializedTry(); try_detail::throwUsingUninitializedTry();
}
} }
} }
......
/*
* Copyright 2004-present Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <folly/Try.h>
namespace folly {
namespace try_detail {
[[noreturn]] void throwTryDoesNotContainException() {
throw TryException("exception(): Try does not contain an exception");
}
[[noreturn]] void throwUsingUninitializedTry() {
throw UsingUninitializedTry();
}
} // namespace try_detail
} // namespace folly
...@@ -39,6 +39,11 @@ class UsingUninitializedTry : public TryException { ...@@ -39,6 +39,11 @@ class UsingUninitializedTry : public TryException {
UsingUninitializedTry() : TryException("Using uninitialized try") {} UsingUninitializedTry() : TryException("Using uninitialized try") {}
}; };
namespace try_detail {
[[noreturn]] void throwTryDoesNotContainException();
[[noreturn]] void throwUsingUninitializedTry();
} // namespace try_detail
/* /*
* Try<T> is a wrapper that contains either an instance of T, an exception, or * Try<T> is a wrapper that contains either an instance of T, an exception, or
* nothing. Exceptions are stored as exception_wrappers so that the user can * nothing. Exceptions are stored as exception_wrappers so that the user can
...@@ -204,15 +209,15 @@ class Try { ...@@ -204,15 +209,15 @@ class Try {
} }
exception_wrapper& exception() { exception_wrapper& exception() {
if (UNLIKELY(!hasException())) { if (!hasException()) {
throw TryException("exception(): Try does not contain an exception"); try_detail::throwTryDoesNotContainException();
} }
return e_; return e_;
} }
const exception_wrapper& exception() const { const exception_wrapper& exception() const {
if (UNLIKELY(!hasException())) { if (!hasException()) {
throw TryException("exception(): Try does not contain an exception"); try_detail::throwTryDoesNotContainException();
} }
return e_; return e_;
} }
...@@ -380,15 +385,15 @@ class Try<void> { ...@@ -380,15 +385,15 @@ class Try<void> {
* @returns mutable reference to the exception contained by this Try * @returns mutable reference to the exception contained by this Try
*/ */
exception_wrapper& exception() { exception_wrapper& exception() {
if (UNLIKELY(!hasException())) { if (!hasException()) {
throw TryException("exception(): Try does not contain an exception"); try_detail::throwTryDoesNotContainException();
} }
return e_; return e_;
} }
const exception_wrapper& exception() const { const exception_wrapper& exception() const {
if (UNLIKELY(!hasException())) { if (!hasException()) {
throw TryException("exception(): Try does not contain an exception"); try_detail::throwTryDoesNotContainException();
} }
return e_; return e_;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment