From ab4a9ef42e8f1070dcb5d783a5afccd2f685e86d Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 17 Jul 2020 15:57:33 +0200
Subject: Add optimized derive_path_with_extension(), use in file_rule

---
 libbuild2/rule.cxx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'libbuild2/rule.cxx')

diff --git a/libbuild2/rule.cxx b/libbuild2/rule.cxx
index 7ccee4e..4b2d69d 100644
--- a/libbuild2/rule.cxx
+++ b/libbuild2/rule.cxx
@@ -94,13 +94,15 @@ namespace build2
           // derivation function to treat this as a prerequisite (just like in
           // search_existing_file()).
           //
-          if (pt->derive_extension (true) == nullptr)
+          if (const string* e = pt->derive_extension (true))
+          {
+            p = &pt->derive_path_with_extension (*e);
+          }
+          else
           {
             l4 ([&]{trace << "no default extension for target " << *pt;});
             return false;
           }
-
-          p = &pt->derive_path ();
         }
 
         ts = mtime (*p);
-- 
cgit v1.1